use wine-staging repo instead of fds-team

9 files changed, 16 insertions, 55 deletions

diff --git a/auto/config b/auto/config
index 2431c22..697fdc1 100755
--- a/auto/config
+++ b/auto/config
@@ -50,21 +50,21 @@ lb config noauto \
 # architecture and distribution depending stuff (e.g. kernel)
 case "$LB_DISTRIBUTION" in
 wheezy)
-	LB_REPOSITORIES+=" dragonfire fds-team-wheezy fds-team-source dragonfire-acritox"
+	LB_REPOSITORIES+=" dragonfire wine-staging dragonfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
 	i386)  LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
 	esac
 	;;
 jessie)
-    LB_REPOSITORIES+=" dragonfire spitfire fds-team-debian fds-team-source spitfire-acritox"
+    LB_REPOSITORIES+=" dragonfire spitfire wine-staging spitfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
 	i386)  LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
 	esac
 	;;
 *)
-    LB_REPOSITORIES+=" dragonfire spitfire fds-team-debian fds-team-source spitfire-acritox"
+    LB_REPOSITORIES+=" dragonfire spitfire wine-staging spitfire-acritox"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
 	i386)  LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
@@ -94,13 +94,7 @@ 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 wine-staging <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" wine-staging"
 grep -wq iceweasel <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" iceweasel"
 grep -wq firefox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" firefox"
 grep -wq silverlight <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" silverlight"
diff --git a/config/lists/wine-staging b/config/lists/wine-staging
index 299d95c..af76894 100644
--- a/config/lists/wine-staging
+++ b/config/lists/wine-staging
@@ -9,3 +9,13 @@ wine-staging
 #if ARCHITECTURE amd64
 wine-staging:i386
 #endif
+
+# compatibility symlinks
+
+#if ARCHITECTURE i386
+wine-staging-compat
+#endif
+
+#if ARCHITECTURE amd64
+wine-staging-compat:i386
+#endif
diff --git a/config/repositories/fds-team-debian b/config/repositories/fds-team-debian
deleted file mode 100644
index cc131cd..0000000
--- a/config/repositories/fds-team-debian
+++ /dev/null
@@ -1 +0,0 @@
-deb http://repos.fds-team.de/stable/debian @DISTRIBUTION@ main
diff --git a/config/repositories/fds-team-source b/config/repositories/fds-team-source
deleted file mode 100644
index 97b0f17..0000000
--- a/config/repositories/fds-team-source
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 60dfc77..0000000
--- a/config/repositories/fds-team-source.gpg
+++ /dev/null
@@ -1,21 +0,0 @@
------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
deleted file mode 100644
index d7f4bce..0000000
--- a/config/repositories/fds-team-wheezy
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 60dfc77..0000000
--- a/config/repositories/fds-team-wheezy.gpg
+++ /dev/null
@@ -1,21 +0,0 @@
------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/wine-staging b/config/repositories/wine-staging
new file mode 100644
index 0000000..ef4bc86
--- /dev/null
+++ b/config/repositories/wine-staging
@@ -0,0 +1,2 @@
+# Wine Staging
+deb http://repos.wine-staging.com/debian @DISTRIBUTION@ main
diff --git a/config/repositories/fds-team-debian.gpg b/config/repositories/wine-staging.gpg
index 7b9cd59..7b9cd59 100644
--- a/config/repositories/fds-team-debian.gpg
+++ b/config/repositories/wine-staging.gpg