Hi,
Andreas patch needed an update to sync with latest version of the package. I'm
attaching it. It works fine, provided that ia32-libs is patched (see #394230
which I just reopened).
Please, can you include this patch in next upload?
etch will most likely be our last release before the 64-bit migration window
finishes in late 2008 [1]. If our 64-bit port has to go through this process
without win32 emulation I'm sure we'll regret it. Let's make sure it gets into
etch!
[1] see http://catb.org/~esr/writings/world-domination/world-domination-201.html
for an in-depth analisys based on Moore's law
--
Robert Millan
My spam trap is [EMAIL PROTECTED] Note: this address is only intended for
spam harvesters. Writing to it will get you added to my black list.
diff -ur wine-0.9.28.old/configure wine-0.9.28/configure
--- wine-0.9.28.old/configure 2006-12-22 17:17:47.000000000 +0100
+++ wine-0.9.28/configure 2007-01-15 21:13:17.000000000 +0100
@@ -10572,7 +10572,7 @@
TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}"
{ echo "$as_me:$LINENO: checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB" >&5
echo $ECHO_N "checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB... $ECHO_C" >&6; }
- LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
+ LIBS="-fatal-warnings $saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
diff -ur wine-0.9.28.old/configure.ac wine-0.9.28/configure.ac
--- wine-0.9.28.old/configure.ac 2007-01-15 21:13:07.000000000 +0100
+++ wine-0.9.28/configure.ac 2007-01-15 21:13:17.000000000 +0100
@@ -594,7 +594,7 @@
TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}"
TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}"
AC_MSG_CHECKING(whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB)
- LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
+ LIBS="-fatal-warnings $saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()],
[AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed])
AC_SUBST(ICULIBS,"$TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s")
diff -ur wine-0.9.28.old/debian/control wine-0.9.28/debian/control
--- wine-0.9.28.old/debian/control 2007-01-15 21:13:07.000000000 +0100
+++ wine-0.9.28/debian/control 2007-01-15 21:15:15.000000000 +0100
@@ -20,11 +20,12 @@
libicu36-dev | libicu34-dev (>= 3.4-4) | libicu28-dev | libicu21-dev,
libfontconfig1-dev, libssl-dev, libcapi20-dev (>= 1:3.3.0.20041024-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libhal-dev, libdbus-1-dev | dbus-1-dev, libgphoto2-2-dev, liblcms1-dev, libldap2-dev,
- libxml2-dev, libxslt1-dev, fontforge, prelink
+ libxml2-dev, libxslt1-dev, fontforge, prelink,
+ libc6-dev-i386 [amd64], ia32-libs [amd64], lib32z1-dev [amd64], lib32asound2-dev [amd64], lib32ncurses5-dev [amd64]
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-amd64 any-i386 any-powerpc any-sparc
Depends: ${debconf-depends}, libwine (= ${Source-Version}), xbase-clients (>= 4.0) | xcontrib
Recommends: wine-utils, msttcorefonts
Suggests: wine-doc, binfmt-support
@@ -40,7 +41,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-amd64 any-i386 any-powerpc any-sparc
Section: libdevel
Depends: libwine (= ${Source-Version}), libc6-dev
Replaces: libwine (<< 0.0.20010216)
@@ -56,8 +57,8 @@
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
-Depends: ${debconf-depends}, ${shlibs:Depends}${freetype}
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
+Depends: ${debconf-depends}, ${shlibs:Depends}${freetype}${ia32-libs}
Replaces: libwine0.0.971116, wine (<< 0.9.11-1), libwine-twain (<< 0.9.13)
Conflicts: libwine0.0.971116
Recommends: libwine-print, libwine-gl${icu}
@@ -72,7 +73,7 @@
Package: libwine-alsa
Section: libs
-Architecture: i386 powerpc sparc
+Architecture: amd64 i386 powerpc sparc
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.
@@ -84,7 +85,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-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Replaces: libwine (<< 0.0.20020710)
Description: Windows API Implementation (aRts Sound Module)
@@ -97,7 +98,7 @@
Package: libwine-capi
Section: libs
-Architecture: i386 powerpc sparc
+Architecture: amd64 i386 powerpc sparc
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.
@@ -110,7 +111,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-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Replaces: libwine (<< 0.0.20050830)
Description: Windows API Implementation (Color Management Module)
@@ -124,7 +125,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-amd64 any-i386 any-powerpc any-sparc
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.
@@ -136,7 +137,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-amd64 any-i386 any-powerpc any-sparc
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.
@@ -149,7 +150,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-amd64 any-i386 any-powerpc any-sparc
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.
@@ -162,7 +163,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-amd64 any-i386 any-powerpc any-sparc
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.
@@ -174,7 +175,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-amd64 any-i386 any-powerpc any-sparc
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.
@@ -187,7 +188,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-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Replaces: libwine (<< 0.0.20020710)
Description: Windows API Implementation (NAS Sound Module)
@@ -200,7 +201,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: amd64 i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}${freetype}${cupsys}
Replaces: libwine (<< 0.0.20020710)
Description: Windows API Implementation (Printing Module)
@@ -214,7 +215,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-amd64 any-i386 any-powerpc any-sparc
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.
@@ -227,7 +228,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-amd64 any-i386 any-powerpc any-sparc
Depends: libwine-sane
Suggests: libwine-gphoto2
Description: Windows API Implementation (empty transitional package)
@@ -235,7 +236,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-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), wine
Replaces: libwine-dev (<< 0.0.20010216)
Description: Windows API Implementation (Utilities)
diff -ur wine-0.9.28.old/debian/rules wine-0.9.28/debian/rules
--- wine-0.9.28.old/debian/rules 2007-01-15 21:13:07.000000000 +0100
+++ wine-0.9.28/debian/rules 2007-01-15 21:13:17.000000000 +0100
@@ -246,6 +246,11 @@
dh_installdeb -s
dh_shlibdeps -s -ldlls:libs:
+ # if the distro we're compiling for has ia32-libs, depend on it
+ (dpkg -s ia32-libs >/dev/null && \
+ echo "ia32-libs=, ia32-libs" >> debian/libwine.substvars) || \
+ true
+
# if the distro we're compiling for has freetype, depend on it
(dpkg -s libfreetype6-dev >/dev/null && \
echo "freetype=, libfreetype6" >> debian/libwine.substvars && \
