diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/control wine-1.1.23~kanotix/debian/control
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/control	2009-06-21 13:21:41.000000000 +0200
+++ wine-1.1.23~kanotix/debian/control	2009-06-21 13:24:00.213863177 +0200
@@ -7,19 +7,18 @@
 Build-Depends: debhelper (>= 5.0.0), flex, bison, libx11-dev, libxt-dev,
  libncurses5-dev [i386 lpia] | libncurses-dev [i386 lpia],
  lib32ncurses5-dev [amd64],
- libcups2-dev, libfontconfig1-dev | libfontconfig-dev, libfreetype6-dev, libgl1-mesa-dev | nvidia-glx-dev | fglrx-driver-dev | libgl-dev, libgif-dev | libungif4-dev, libjack-dev, libaudio-dev,
+ libcupsys2-dev | libcups2-dev, libfontconfig1-dev | libfontconfig-dev, libfreetype6-dev, libgl1-mesa-dev | nvidia-glx-dev | fglrx-driver-dev | libgl-dev, libgif-dev | libungif4-dev, libjack-dev, libaudio-dev,
  libasound2-dev [i386 lpia],
  lib32asound2-dev [amd64],
  libglu1-mesa-dev | libglu-dev, libxext-dev,
  linux-kernel-headers,
  libssl-dev, libgnutls-dev,
- libcapi20-dev, docbook-utils, docbook-xsl, docbook-to-man, libjpeg62-dev, fontforge, libstdc++6-4.2-dev | libstdc++6-4.1-dev | libstdc++-dev, libldap2-dev, libxml2-dev, libxslt1-dev, libxxf86vm-dev, prelink [i386 amd64], libsane-dev, libhal-dev, libhal-storage-dev, libgphoto2-2-dev, libxrender-dev, libxcursor-dev, libesd0-dev, libxrandr-dev, liblcms1-dev, x11proto-xinerama-dev, libpng12-dev, libxcomposite-dev,
+ libcapi20-dev, libjpeg62-dev, fontforge, libstdc++6-4.2-dev | libstdc++6-4.1-dev | libstdc++-dev, libldap2-dev, libxml2-dev, libxslt1-dev, libxxf86vm-dev, prelink [i386 amd64], libsane-dev, libhal-dev, libhal-storage-dev, libgphoto2-2-dev, libxrender-dev, libxcursor-dev, libesd0-dev, libxrandr-dev, liblcms1-dev, x11proto-xinerama-dev, libpng12-dev, libxcomposite-dev,
  libc6-dev-i386 [amd64], lib32z1-dev [amd64], ia32-libs [amd64], gcc-multilib [amd64], libxi-dev, libxinerama-dev
 Standards-Version: 3.7.3
 
 Package: wine
 Architecture: any
-Pre-Depends: dpkg (>= 1.14.12ubuntu3)
 Depends: procps, binfmt-support (>= 1.1.2), ${shlibs:Depends}
 Recommends: ttf-liberation, winbind, wine-gecko
 Suggests: msttcorefonts, xdg-utils
@@ -40,7 +39,6 @@
 Package: wine-dev
 Architecture: any
 Section: libdevel
-Pre-Depends: dpkg (>= 1.14.12ubuntu3)
 Depends: wine (= ${binary:Version}), libc6-dev
 Conflicts: libwine-dev
 Replaces: libwine-dev, libwine
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/rules wine-1.1.23~kanotix/debian/rules
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/rules	2009-06-21 13:21:41.000000000 +0200
+++ wine-1.1.23~kanotix/debian/rules	2009-06-21 13:22:47.214163499 +0200
@@ -34,8 +34,8 @@
 	# Wine can be built with both 64 and 32 bit support
 	# CONFFLAGS += --enable-win64
 
-	# Wine installs 32 bit libraries, place those into /usr/lib32
-	CONFFLAGS += --libdir=\$${prefix}/lib32
+	# Wine installs 32 bit libraries, place those into /emul/ia32-linux/usr/lib
+	CONFFLAGS += --libdir=$(CURDIR)/debian/tmp/emul/ia32-linux/usr/lib
 endif
 
 
@@ -52,7 +52,7 @@
 
 	# Add here commands to compile the package.
 	$(MAKE) depend
-	$(MAKE)
+	$(MAKE) -j$(shell grep -c ^processor /proc/cpuinfo 2>/dev/null||echo 1)
 
 	# Make the documentation.  The dh_installdocs command should install them
 	# Remember to have the files wine.docs and wine-dev.docs point to any new
@@ -153,7 +153,7 @@
 	dh_strip -Xwine-pthread -Xwine-kthread
 	dh_compress
 	dh_fixperms
-	dh_icons
+	dh_icons||true
 	dh_desktop
 	dh_makeshlibs
 	dh_installdeb
@@ -164,7 +164,7 @@
 	dh_gencontrol
 endif
 	dh_md5sums
-	dh_builddeb -- -Z lzma
+	dh_builddeb -- -Z bzip2
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/wine-dev.install.amd64 wine-1.1.23~kanotix/debian/wine-dev.install.amd64
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/wine-dev.install.amd64	2009-06-21 13:21:41.000000000 +0200
+++ wine-1.1.23~kanotix/debian/wine-dev.install.amd64	2009-06-21 13:22:39.097042681 +0200
@@ -1,2 +1,2 @@
-usr/lib32/*.so
+emul/ia32-linux/usr/lib/*.so
 usr/include
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.dirs.amd64 wine-1.1.23~kanotix/debian/wine.dirs.amd64
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.dirs.amd64	2009-06-21 13:21:41.000000000 +0200
+++ wine-1.1.23~kanotix/debian/wine.dirs.amd64	2009-06-21 13:22:39.097042681 +0200
@@ -3,6 +3,6 @@
 usr/share/man
 usr/share/man/man1
 usr/share/man/man5
-usr/lib32
-usr/lib32/wine
+emul/ia32-linux/usr/lib
+emul/ia32-linux/usr/lib/wine
 etc/sysctl.d
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.install.amd64 wine-1.1.23~kanotix/debian/wine.install.amd64
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.install.amd64	2009-06-21 13:21:41.000000000 +0200
+++ wine-1.1.23~kanotix/debian/wine.install.amd64	2009-06-21 13:22:39.097042681 +0200
@@ -1,6 +1,6 @@
 usr/bin
 usr/share
-usr/lib32/wine
-usr/lib32/*.so.*
+emul/ia32-linux/usr/lib/wine
+emul/ia32-linux/usr/lib/*.so.*
 etc/xdg
 etc/sysctl.d
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.postinst wine-1.1.23~kanotix/debian/wine.postinst
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.postinst	2009-06-21 13:21:41.000000000 +0200
+++ wine-1.1.23~kanotix/debian/wine.postinst	2009-06-21 13:23:45.555362515 +0200
@@ -13,7 +13,7 @@
 	fi
 fi
 
-invoke-rc.d procps start
+invoke-rc.d procps.sh start
 
 #DEBHELPER#