From b56948f392be69049bf54cb19a99641b6e823cc3 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 11 Jan 2015 13:42:15 +0100
Subject: [PATCH] debian/rules: Second attempt to fix Debian/Ubuntu
 dependencies, this time by providing the compatibility symlinks in the main
 package.

---
 debian/control | 12 +++---------
 debian/rules   | 23 ++++++++++-------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index 1c937699..731c4dfc 100644
--- a/debian/control
+++ b/debian/control
@@ -247,9 +247,7 @@ Description: The Staging Edition is a special build of the popular Wine software
 
 Package: wine-compholio
 Architecture: i386 amd64
-Depends: wine-staging, ${misc:Depends},
-         wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-         wine-compholio-amd64 (= ${binary:Version}) [amd64],
+Depends: wine-staging, ${misc:Depends}
 Priority: extra
 Section: oldlibs
 Description: Transitional dummy package
@@ -273,9 +271,7 @@ Description: Transitional dummy package
 
 Package: wine-compholio-dev
 Architecture: i386 amd64
-Depends: wine-staging-dev, ${misc:Depends},
-         wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-         wine-compholio-amd64 (= ${binary:Version}) [amd64],
+Depends: wine-staging-dev, ${misc:Depends}
 Priority: extra
 Section: oldlibs
 Description: Transitional dummy package
@@ -283,9 +279,7 @@ Description: Transitional dummy package
 
 Package: wine-compholio-dbg
 Architecture: i386 amd64
-Depends: wine-staging-dbg, ${misc:Depends},
-         wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-         wine-compholio-amd64 (= ${binary:Version}) [amd64],
+Depends: wine-staging-dbg, ${misc:Depends}
 Priority: extra
 Section: oldlibs
 Description: Transitional dummy package
diff --git a/debian/rules b/debian/rules
index 65e657a1..913ba45c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,19 +60,16 @@ override_dh_install:
 		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
 	done
 
-	if [ -e debian/wine-staging-i386 ]; then \
-		mkdir -p debian/wine-compholio-i386/opt/wine-compholio/bin; \
-		for _file in $$(ls "debian/wine-staging-i386/opt/wine-staging/bin"); do \
-			ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio-i386/opt/wine-compholio/bin/$$_file"; \
-		done \
-	fi
-
-	if [ -e debian/wine-staging-amd64 ]; then \
-		mkdir -p debian/wine-compholio-amd64/opt/wine-compholio/bin; \
-		for _file in $$(ls "debian/wine-staging-amd64/opt/wine-staging/bin"); do \
-			ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio-amd64/opt/wine-compholio/bin/$$_file"; \
-		done \
-	fi
+	# Architecture specific compatibility symlinks
+ifeq ($(DEB_HOST_ARCH),amd64)
+	for _file in wine wine-preloader wine64 wine64-preloader; do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+else
+	for _file in wine wine-preloader; do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+endif
 
 override_dh_strip:
 	dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-staging-dbg