Package: wine
Severity: normal
Tags: patch

I've been looking at some of the things needed to get wine properly working
on amd64 using biarch.

 - A pair of binutils patches:

   #379596: Problems linking 32bit libraries on AMD64

   #381306: ld exits succesfuly when attempting horrid linking of mixed 32/64 
bit objects

 - A patch for wine debian/control (attached)

 - Sorting out this blurb in debian/rules.  It hardcodes library paths that
   are not necessarily of the right width.  Why aren't the upstream autoconf
   checks good enough?

        ICUUC_LIB="` \
        (dpkg -s libicu34-dev >/dev/null && \
         echo "/usr/lib/libsicuuc.a") || \
        (dpkg -s libicu28-dev >/dev/null && \
         echo "/usr/lib/libsicuuc.a") || \
        (dpkg -s libicu21-dev >/dev/null && \
         echo "/usr/lib/libicuuc.a") || \
        echo ""`" \
        ICUDATA_LIB="` \
        (dpkg -s libicu34-dev >/dev/null && \
         echo "/usr/lib/libsicudata.a") || \
        (dpkg -s libicu28-dev >/dev/null && \
         echo "/usr/lib/libsicudata.a") || \
        (dpkg -s libicu21-dev >/dev/null && \
         echo "/usr/lib/libicudata.a") || \
        echo ""`" \

  - Adding 32bit versions of a few X11 libraries... oh well.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-amd64-k8
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8)
diff -ur wine-0.9.15.old/debian/control wine-0.9.15/debian/control
--- wine-0.9.15.old/debian/control      2006-08-03 15:48:53.000000000 +0200
+++ wine-0.9.15/debian/control  2006-08-03 17:24:08.000000000 +0200
@@ -23,7 +23,7 @@
 Standards-Version: 3.6.0
 
 Package: wine
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: ${debconf-depends}, libwine (= ${Source-Version}), xbase-clients (>= 
4.0) | xcontrib
 Recommends: wine-utils, msttcorefonts
 Suggests: wine-doc, binfmt-support
@@ -39,7 +39,7 @@
  Wine is often updated.
 
 Package: libwine-dev
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Section: libdevel
 Depends: libwine (= ${Source-Version}), libc6-dev
 Replaces: libwine (<< 0.0.20010216)
@@ -55,7 +55,7 @@
 
 Package: libwine
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: ${debconf-depends}, ${shlibs:Depends}${freetype}
 Replaces: libwine0.0.971116, wine (<< 0.9.11-1), libwine-twain (<< 0.9.13)
 Conflicts: libwine0.0.971116
@@ -71,7 +71,7 @@
 
 Package: libwine-alsa
 Section: libs
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Description: Windows API Implementation (ALSA Sound Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -83,7 +83,7 @@
 
 Package: libwine-arts
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Replaces: libwine (<< 0.0.20020710)
 Description: Windows API Implementation (aRts Sound Module)
@@ -96,7 +96,7 @@
 
 Package: libwine-capi
 Section: libs
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Description: Windows API Implementation (ISDN Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -109,7 +109,7 @@
 
 Package: libwine-cms
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Replaces: libwine (<< 0.0.20050830)
 Description: Windows API Implementation (Color Management Module)
@@ -123,7 +123,7 @@
 
 Package: libwine-esd
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Description: Windows API Implementation (EsounD Sound Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -135,7 +135,7 @@
 
 Package: libwine-gl
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Description: Windows API Implementation (OpenGL Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -148,7 +148,7 @@
 
 Package: libwine-gphoto2
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Description: Windows API Implementation (Camera Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -161,7 +161,7 @@
 
 Package: libwine-jack
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}${jack}
 Description: Windows API Implementation (JACK Sound Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -173,7 +173,7 @@
 
 Package: libwine-ldap
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Description: Windows API Implementation (LDAP Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -186,7 +186,7 @@
 
 Package: libwine-nas
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Replaces: libwine (<< 0.0.20020710)
 Description: Windows API Implementation (NAS Sound Module)
@@ -199,7 +199,7 @@
 
 Package: libwine-print
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}${freetype}${cupsys}
 Replaces: libwine (<< 0.0.20020710)
 Description: Windows API Implementation (Printing Module)
@@ -213,7 +213,7 @@
 
 Package: libwine-sane
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
 Description: Windows API Implementation (Scanner Module)
  This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -226,7 +226,7 @@
 
 Package: libwine-twain
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine-sane
 Suggests: libwine-gphoto2
 Description: Windows API Implementation (empty transitional package)
@@ -234,7 +234,7 @@
  and libwine-gphoto2 packages. It can safely be removed.
 
 Package: wine-utils
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc 
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-i386 any-powerpc any-sparc any-amd64
 Depends: libwine (= ${Source-Version}), wine
 Replaces: libwine-dev (<< 0.0.20010216)
 Description: Windows API Implementation (Utilities)

Reply via email to