use wine-staging from fds-team

11 files changed, 124 insertions, 14 deletions

diff --git a/auto/config b/auto/config
index be4aff2..04aa85e 100755
--- a/auto/config
+++ b/auto/config
@@ -57,14 +57,14 @@ squeeze)
 	esac
 	;;
 wheezy)
-	LB_REPOSITORIES+=" dragonfire dragonfire-acritox"
+	LB_REPOSITORIES+=" dragonfire fds-team-wheezy fds-team-source dragonfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image-extra-3.18.0-14 linux-headers-3.18.0-14"; LB_LINUX_FLAVOURS="generic";;
 	i386)  LB_LINUX_PACKAGES="linux-image-extra-3.18.0-14 linux-headers-3.18.0-14"; LB_LINUX_FLAVOURS="generic";;
 	esac
 	;;
 jessie|*)
-    LB_REPOSITORIES+=" dragonfire spitfire spitfire-acritox"
+    LB_REPOSITORIES+=" dragonfire spitfire fds-team-debian fds-team-source spitfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image-extra-3.18.0-14 linux-headers-3.18.0-14"; LB_LINUX_FLAVOURS="generic";;
 	i386)  LB_LINUX_PACKAGES="linux-image-extra-3.18.0-14 linux-headers-3.18.0-14"; LB_LINUX_FLAVOURS="generic";;
@@ -93,6 +93,13 @@ if grep -wq steam <<<"$LB_PACKAGES_LISTS"; then
         LB_REPOSITORIES+=" steam"
     fi
 fi
+if grep -wq wine-staging <<<"$LB_PACKAGES $LB_PACKAGES_LISTS"; then
+    if [ "$LB_DISTRIBUTION" = "wheezy" ]; then
+        LB_REPOSITORIES+=" fds-team-wheezy fds-team-source"
+    else
+        LB_REPOSITORIES+=" fds-team-debian fds-team-source"
+    fi
+fi
 grep -wq iceweasel <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" iceweasel"
 grep -wq firefox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" firefox-wheezy"
 grep -wq silverlight <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" silverlight"
diff --git a/config/chroot_local-hooks/wine-unstable-hotfix b/config/chroot_local-hooks/wine-unstable-hotfix
index 5081465..5a41912 100755
--- a/config/chroot_local-hooks/wine-unstable-hotfix
+++ b/config/chroot_local-hooks/wine-unstable-hotfix
@@ -5,3 +5,8 @@ for w in wine-unstable wine-development; do
         chmod +x /usr/bin/wine
     fi
 done
+
+if [ -x /opt/wine-staging/bin/wine ]; then
+    printf '#!/bin/sh\n/opt/wine-staging/bin/wine "$@"\n' > /usr/bin/wine
+    chmod +x /usr/bin/wine
+fi
diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master
index f27206e..0eb79a1 100644
--- a/config/lists/kanotix-kde-master
+++ b/config/lists/kanotix-kde-master
@@ -41,12 +41,7 @@ update-manager-core
 #update-notifier-kde
 
 # wine
-#if DISTRIBUTION wheezy
-#include <wheezy-wine>
-#endif
-#nif DISTRIBUTION wheezy
-#include <jessie-wine>
-#endif
+#include <wine-staging>
 
 # games
 armagetronad
diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full
index 78d2bd4..ef7bf5d 100644
--- a/config/lists/kanotix-lxde-full
+++ b/config/lists/kanotix-lxde-full
@@ -21,12 +21,7 @@ sane
 icedove-l10n-de
 
 # wine
-#if DISTRIBUTION wheezy
-#include <wheezy-wine>
-#endif
-#nif DISTRIBUTION wheezy
-#include <jessie-wine>
-#endif
+#include <wine-staging>
 
 # games
 
diff --git a/config/lists/wine-staging b/config/lists/wine-staging
new file mode 100644
index 0000000..299d95c
--- /dev/null
+++ b/config/lists/wine-staging
@@ -0,0 +1,11 @@
+# wine-staging (multiarch)
+
+winetricks
+
+#if ARCHITECTURE i386
+wine-staging
+#endif
+
+#if ARCHITECTURE amd64
+wine-staging:i386
+#endif
diff --git a/config/repositories/fds-team-debian b/config/repositories/fds-team-debian
new file mode 100644
index 0000000..cc131cd
--- /dev/null
+++ b/config/repositories/fds-team-debian
@@ -0,0 +1 @@
+deb http://repos.fds-team.de/stable/debian @DISTRIBUTION@ main
diff --git a/config/repositories/fds-team-debian.gpg b/config/repositories/fds-team-debian.gpg
new file mode 100644
index 0000000..7b9cd59
--- /dev/null
+++ b/config/repositories/fds-team-debian.gpg
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+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
+=ca+X
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/fds-team-source b/config/repositories/fds-team-source
new file mode 100644
index 0000000..97b0f17
--- /dev/null
+++ b/config/repositories/fds-team-source
@@ -0,0 +1 @@
+deb-src http://download.opensuse.org/repositories/home:/DarkPlayer:/Pipelight/Debian_7.0 ./
diff --git a/config/repositories/fds-team-source.gpg b/config/repositories/fds-team-source.gpg
new file mode 100644
index 0000000..60dfc77
--- /dev/null
+++ b/config/repositories/fds-team-source.gpg
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBFIWoRcBCACoywz+wYZmvKNVdDMSAdYV1rGrHQra62W0w9swo5l66itju6B9
+qdJszBZMPwaW+e5y+E9MX7M5Ee2COs4xKUwigXp4xbC2RFeE49Zf5g2bGGPyqP/w
+VoaNkJWo7idT5DJ0oCweI+vcm6t2UxmMHOue85MHyahi70ghWK/g3Mqr8+6AGugJ
+0e6lUr0oW67yUd6TA54+5P3HU1XGWp0AWPMa4SNcOhp+HQo7Nijz9DKTzTf0dxvS
+qTm4SKf2Y7RDZpnp3aIo63x1MhGgVfFNLwL0CpDqbUwAQj+tFqchUh7J/fbNlHpO
+HqtudMYfl8BkO1shsnMmLVW1wqvu3KACLLzfABEBAAG0QGhvbWU6RGFya1BsYXll
+ciBPQlMgUHJvamVjdCA8aG9tZTpEYXJrUGxheWVyQGJ1aWxkLm9wZW5zdXNlLm9y
+Zz6JATwEEwECACYFAlIWoRcCGwMFCQQesAAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
+gAAKCRABNOujyqXfyL/xB/oCMFVhTmCF4E4qhPzyM3dRQbg+T4G7VacM/6k1Isbd
+Ejl3ju7nOuH3Dq4puJyEPaMCdtN6Tj1260GIuLgNPRCg6jIGfnMmJZBkp/MJBhAU
+MaQ596OS33MKnW7yPojRpgkmZRAGxqbHpP7AEfTgl+dO4h29SewWTYHq+18qrtUb
+wPhtpEfWVM4b0wAFVsci8JRcGAUvBjG8qb4rSe5wMJ8MWjy6lVGlF0GiNkGHTUj9
+SJ6zjbHsAUGp7BERZ4cSGboPn5ZSlOg3URAl1dNThpBCxI1rD9u4MFWbm47LwpXr
+ZzaoeqOvig4K7PqTuhMxLhhyg753BQ8BH+eqWaEfNxitiEYEExECAAYFAlIWoRcA
+CgkQOzARt2udZSP3ZgCeIthn0ZnIO7nDpyodOz7igb4U1RIAnR6xjQP2tvz/Wc0v
+L47Ry1d5r5lZ
+=dTXL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/fds-team-wheezy b/config/repositories/fds-team-wheezy
new file mode 100644
index 0000000..d7f4bce
--- /dev/null
+++ b/config/repositories/fds-team-wheezy
@@ -0,0 +1 @@
+deb http://download.opensuse.org/repositories/home:/DarkPlayer:/Pipelight/Debian_7.0 ./
diff --git a/config/repositories/fds-team-wheezy.gpg b/config/repositories/fds-team-wheezy.gpg
new file mode 100644
index 0000000..60dfc77
--- /dev/null
+++ b/config/repositories/fds-team-wheezy.gpg
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBFIWoRcBCACoywz+wYZmvKNVdDMSAdYV1rGrHQra62W0w9swo5l66itju6B9
+qdJszBZMPwaW+e5y+E9MX7M5Ee2COs4xKUwigXp4xbC2RFeE49Zf5g2bGGPyqP/w
+VoaNkJWo7idT5DJ0oCweI+vcm6t2UxmMHOue85MHyahi70ghWK/g3Mqr8+6AGugJ
+0e6lUr0oW67yUd6TA54+5P3HU1XGWp0AWPMa4SNcOhp+HQo7Nijz9DKTzTf0dxvS
+qTm4SKf2Y7RDZpnp3aIo63x1MhGgVfFNLwL0CpDqbUwAQj+tFqchUh7J/fbNlHpO
+HqtudMYfl8BkO1shsnMmLVW1wqvu3KACLLzfABEBAAG0QGhvbWU6RGFya1BsYXll
+ciBPQlMgUHJvamVjdCA8aG9tZTpEYXJrUGxheWVyQGJ1aWxkLm9wZW5zdXNlLm9y
+Zz6JATwEEwECACYFAlIWoRcCGwMFCQQesAAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
+gAAKCRABNOujyqXfyL/xB/oCMFVhTmCF4E4qhPzyM3dRQbg+T4G7VacM/6k1Isbd
+Ejl3ju7nOuH3Dq4puJyEPaMCdtN6Tj1260GIuLgNPRCg6jIGfnMmJZBkp/MJBhAU
+MaQ596OS33MKnW7yPojRpgkmZRAGxqbHpP7AEfTgl+dO4h29SewWTYHq+18qrtUb
+wPhtpEfWVM4b0wAFVsci8JRcGAUvBjG8qb4rSe5wMJ8MWjy6lVGlF0GiNkGHTUj9
+SJ6zjbHsAUGp7BERZ4cSGboPn5ZSlOg3URAl1dNThpBCxI1rD9u4MFWbm47LwpXr
+ZzaoeqOvig4K7PqTuhMxLhhyg753BQ8BH+eqWaEfNxitiEYEExECAAYFAlIWoRcA
+CgkQOzARt2udZSP3ZgCeIthn0ZnIO7nDpyodOz7igb4U1RIAnR6xjQP2tvz/Wc0v
+L47Ry1d5r5lZ
+=dTXL
+-----END PGP PUBLIC KEY BLOCK-----