[pkg-wine-party] [SCM] Debian Wine packaging branch, lenny, updated. wine-1.0.0-1-1-g1953534

[Ove Kaaven]

The following commit has been merged in the lenny branch:
commit 195353407362b1510b100f335e83f82b8da4e836
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Tue Oct 21 22:46:03 2008 +0200

    Imported NMU of Wine 1.0.0-1 by Thomas Viehmann.

diff --git a/debian/changelog b/debian/changelog
index 68bcd95..7925e22 100644
--- a/debian/changelog
+++ b/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.
diff --git a/debian/control b/debian/control
index 71d374b..45b63b7 100644
--- a/debian/control
+++ b/debian/control
@@ -165,7 +165,7 @@ Description: Windows API implementation - camera module
 
 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 --git a/debian/maint/build b/debian/maint/build
old mode 100755
new mode 100644
diff --git a/debian/maint/build-final b/debian/maint/build-final
old mode 100755
new mode 100644
diff --git a/debian/maint/import b/debian/maint/import
old mode 100755
new mode 100644
diff --git a/debian/maint/import-done b/debian/maint/import-done
old mode 100755
new mode 100644
diff --git a/debian/rules b/debian/rules
index 3d5aef1..7eef4a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -302,7 +302,11 @@ endif
 	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

-- 
Debian Wine packaging