From 7729238e7fc841b597ccd97c96aa3e1be6676881 Mon Sep 17 00:00:00 2001
From: Joerg Schirottke <master@kanotix.com>
Date: Fri, 22 Aug 2014 22:52:46 +0200
Subject: wine-development hotfix

---
 config/chroot_local-hooks/wine-unstable-hotfix | 10 ++++++----
 config/lists/jessie-wine                       | 13 +++++++++++++
 config/lists/kanotix-kde-master                | 10 ++++------
 config/lists/kanotix-lxde-full                 | 10 ++++------
 4 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 config/lists/jessie-wine

diff --git a/config/chroot_local-hooks/wine-unstable-hotfix b/config/chroot_local-hooks/wine-unstable-hotfix
index 09f2713..5081465 100755
--- a/config/chroot_local-hooks/wine-unstable-hotfix
+++ b/config/chroot_local-hooks/wine-unstable-hotfix
@@ -1,5 +1,7 @@
 #!/bin/sh
-if  [ -x /usr/bin/wine-unstable -a ! -x /usr/bin/wine ]; then
-    printf '#!/bin/sh\nwine-unstable "$@"\n' > /usr/bin/wine
-    chmod +x /usr/bin/wine
-fi
+for w in wine-unstable wine-development; do
+    if  [ -x /usr/bin/$w -a ! -x /usr/bin/wine ]; then
+        printf '#!/bin/sh\n'$w' "$@"\n' > /usr/bin/wine
+        chmod +x /usr/bin/wine
+    fi
+done
diff --git a/config/lists/jessie-wine b/config/lists/jessie-wine
new file mode 100644
index 0000000..7cd5b23
--- /dev/null
+++ b/config/lists/jessie-wine
@@ -0,0 +1,13 @@
+# wine for jessie (multiarch)
+
+winetricks
+
+#if ARCHITECTURE i386
+wine-development
+#endif
+
+#if ARCHITECTURE amd64
+wine-development:i386
+libncurses5:i386
+libxtst6:i386
+#endif
diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master
index 6a71833..be6dce5 100644
--- a/config/lists/kanotix-kde-master
+++ b/config/lists/kanotix-kde-master
@@ -39,14 +39,12 @@ update-manager-core
 update-notifier-kde
 
 # wine
-#if DISTRIBUTION squeeze
-wine1.3
-wine1.3-gecko
-winetricks
-#endif
-#nif DISTRIBUTION squeeze
+#if DISTRIBUTION wheezy
 #include <wheezy-wine>
 #endif
+#nif DISTRIBUTION wheezy
+#include <jessie-wine>
+#endif
 
 # games
 armagetronad
diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full
index e10c546..78d2bd4 100644
--- a/config/lists/kanotix-lxde-full
+++ b/config/lists/kanotix-lxde-full
@@ -21,14 +21,12 @@ sane
 icedove-l10n-de
 
 # wine
-#if DISTRIBUTION squeeze
-wine1.3
-wine1.3-gecko
-winetricks
-#endif
-#nif DISTRIBUTION squeeze
+#if DISTRIBUTION wheezy
 #include <wheezy-wine>
 #endif
+#nif DISTRIBUTION wheezy
+#include <jessie-wine>
+#endif
 
 # games
 
-- 
cgit v1.0