[pkg-wine-party] Bug#493169: wine: diff for NMU version 1.0.0-1.1

[Thomas Viehmann]

tags 493169 + patch pending
thanks

I could reproduce the bug by setting audio to JACK in winecfg and then
quitting winecfg, restarting it, and then playing the test sound.
Inspection with WINEDEBUG=trace+jack (and similar) and comparison with
the source seems to indicate that the crash happens when wine
registers the callback functions. This, combined with what I see on
the the bts (the report asking for libjack to be included into Debian)
the timeline of that, and the other comments on the web, leads me to
conclude that libwine-jack never worked on amd64 and should be removed.
I'm uploading the NMU attached below to delayed 2-day so you get a
change to protest.

Kind regards

T.

diff -u wine-1.0.0/debian/control wine-1.0.0/debian/control
--- wine-1.0.0/debian/control
+++ wine-1.0.0/debian/control
@@ -165,7 +165,7 @@
 
 Package: libwine-jack
 Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
 Depends: ${shlibs:Depends}
 Description: Windows API implementation - JACK sound module
  Wine is a free MS-Windows API implementation.
diff -u wine-1.0.0/debian/rules wine-1.0.0/debian/rules
--- wine-1.0.0/debian/rules
+++ wine-1.0.0/debian/rules
@@ -302,7 +302,11 @@
 	mv debian/libwine/usr/lib/wine/d3dxof*   debian/libwine-gl/usr/lib/wine
 	mv debian/libwine/usr/lib/wine/glu32*    debian/libwine-gl/usr/lib/wine
 	mv debian/libwine/usr/lib/wine/opengl32* debian/libwine-gl/usr/lib/wine
+ifeq ($(DEB_HOST_GNU_CPU),x86_64)
+	rm debian/libwine/usr/lib/wine/winejack*
+else
 	mv debian/libwine/usr/lib/wine/winejack* debian/libwine-jack/usr/lib/wine
+endif
 	mv debian/libwine/usr/lib/wine/wldap32*  debian/libwine-ldap/usr/lib/wine
 	mv debian/libwine/usr/lib/wine/winenas*  debian/libwine-nas/usr/lib/wine
 	mv debian/libwine/usr/lib/wine/wineps*   debian/libwine-print/usr/lib/wine
diff -u wine-1.0.0/debian/changelog wine-1.0.0/debian/changelog
--- wine-1.0.0/debian/changelog
+++ wine-1.0.0/debian/changelog
@@ -1,3 +1,13 @@
+wine (1.0.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Disable libwine-jack on amd64 and kfreebsd-amd64 as libjack's
+    callback architecture does not seem to work too well between
+    wine using 32 bit libjack and jackd using 64 bit.
+    Closes: #493169
+
+ -- Thomas Viehmann <tv at beamnet.de>  Sun, 12 Oct 2008 10:57:43 +0200
+
 wine (1.0.0-1) unstable; urgency=high
 
   * New upstream release 1.0, released Jun 17, 2008.