[pkg-wine-party] [PATCH 2/7] Build libraries, libwine-bin, wine-bin, etc. on amd64

[Hilko Bengen]

---
 debian/control.in              |   28 ++++++++++++++--------------
 debian/rules                   |    6 +++---
 debian/wine-bin.install-common |    2 --
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 9842385..b31c0bb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -46,7 +46,7 @@ Description: Windows API implementation - standard suite
  This is a virtual package that depends on the standard Wine components.
 
 Package: wine-bin
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: foreign
 Depends:
  ${misc:Depends},
@@ -84,7 +84,7 @@ Description: Windows API implementation - binary loader
  systems.
 
 Package: libwine-dbg
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-xamd64 any-powerpc any-sparc
 Multi-Arch: same
 Section: debug
 Priority: extra
@@ -99,7 +99,7 @@ Description: Windows API implementation - debugging symbols
  This package provides debugging symbols.
 
 Package: libwine-dev
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Section: libdevel
 Depends:
  ${misc:Depends},
@@ -119,7 +119,7 @@ Description: Windows API implementation - development files
 
 Package: libwine
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -170,7 +170,7 @@ Description: Windows API implementation - wine server
 
 Package: libwine-alsa
 Section: libs
-Architecture: i386 any-powerpc any-sparc
+Architecture: i386 amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -183,7 +183,7 @@ Description: Windows API implementation - ALSA sound module
 
 Package: libwine-bin
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -215,7 +215,7 @@ Description: Windows API implementation - ISDN module
 
 Package: libwine-cms
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -231,7 +231,7 @@ Description: Windows API implementation - color management module
 
 Package: libwine-gl
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -247,7 +247,7 @@ Description: Windows API implementation - OpenGL module
 
 Package: libwine-gphoto2
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -261,7 +261,7 @@ Description: Windows API implementation - camera module
 
 Package: libwine-ldap
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -275,7 +275,7 @@ Description: Windows API implementation - LDAP module
 
 Package: libwine-openal
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -289,7 +289,7 @@ Description: Windows API implementation - OpenAL module
 
 Package: libwine-oss
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -305,7 +305,7 @@ Description: Windows API implementation - OSS sound module
 
 Package: libwine-print
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -322,7 +322,7 @@ Description: Windows API implementation - printing module
 
 Package: libwine-sane
 Section: libs
-Architecture: any-i386 any-powerpc any-sparc
+Architecture: any-i386 any-amd64 any-powerpc any-sparc
 Multi-Arch: same
 Depends:
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 86b1a77..9deeca9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,8 @@ endif
 
 ifeq (y,$(MULTIARCH))
 # full multiarch, cannot build 32-bit Wine on amd64
-BUILDS =
-LIBDIRS =
+BUILDS = build64
+#LIBDIRS =
 #TRANSPREFIX = ia32-
 #TRANSSUFFIX = $(VERSUFFIX)
 else
@@ -272,7 +272,7 @@ install-arch64-stamp: build-arch64-stamp $(patsubst build%,install-arch%-stamp,$
 	# install wine, libwine, fonts, and tools
 	$(MAKE) -C build64 install $(AMD64_OVERRIDES) DESTDIR=$(CURDIR)/debian/tmp
 	# move the real binaries into /$(AMD64_WINEDIR)
-	mv debian/tmp/usr/bin/wine debian/tmp/$(AMD64_WINEDIR)/wine.bin
+	mv debian/tmp/usr/bin/wine64 debian/tmp/$(AMD64_WINEDIR)/wine.bin
 	# install manpages
 	$(MAKE) -C build64/documentation install-man DESTDIR=$(CURDIR)/debian/tmp
 	mv debian/tmp/usr/share/man/man3w debian/tmp/usr/share/man/man3
diff --git a/debian/wine-bin.install-common b/debian/wine-bin.install-common
index 13c71fd..9e79cc8 100644
--- a/debian/wine-bin.install-common
+++ b/debian/wine-bin.install-common
@@ -5,5 +5,3 @@ debian/tmp/usr/share/wine/wine.inf
 debian/tmp/usr/share/wine/l_intl.nls
 debian/uninstaller.desktop usr/share/applications
 debian/winecfg.desktop usr/share/applications
-debian/tmp/usr/share/man/man1/winedbg32.1
-debian/tmp/usr/share/man/man1/wine32.1
-- 
1.7.10