diff -Nru wine-1.1.19~kanotix/debian/rules wine-1.1.19~kanotix-2/debian/rules --- wine-1.1.19~kanotix/debian/rules 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/rules 2009-04-26 13:43:44.000000000 +0200 @@ -33,13 +33,6 @@ # Support for 64-bit windows binaries is disabled for now until # Wine can be built with both 64 and 32 bit support # CONFFLAGS += --enable-win64 - - # There are missing symlinks in /usr/lib32, even with the appropriate - # build dependencies installed, so we will create symlinks ourselves in - # our own temporary library directory - LIBTMP := $(shell pwd)/debian/libtmp - LDFLAGS += -L$(LIBTMP) - CONFFLAGS += --libdir=\$${prefix}/lib32 endif @@ -57,46 +50,6 @@ dh_testdir # Add here commands to configure the package. - # On amd64 we must use our temporary lib directory to create symlinks - # since the linker demands *.so files and they are missing from the - # 32 bit library packages -ifeq ($(DEB_BUILD_ARCH), amd64) - mkdir -p $(LIBTMP) - ln -s /usr/lib32/libX11.so.6 $(LIBTMP)/libX11.so - ln -s /usr/lib32/libXext.so.6 $(LIBTMP)/libXext.so - ln -s /usr/lib32/libfreetype.so.6 $(LIBTMP)/libfreetype.so - ln -s /usr/lib32/libfontconfig.so.1 $(LIBTMP)/libfontconfig.so - ln -s /usr/lib32/libGL.so.1 $(LIBTMP)/libGL.so - ln -s /usr/lib32/libGLU.so.1 $(LIBTMP)/libGLU.so - ln -s /usr/lib32/libXrender.so.1 $(LIBTMP)/libXrender.so - ln -s /usr/lib32/libXinerama.so.1 $(LIBTMP)/libXinerama.so - ln -s /usr/lib32/libXxf86vm.so.1 $(LIBTMP)/libXxf86vm.so - ln -s /usr/lib32/libXi.so.6 $(LIBTMP)/libXi.so - ln -s /usr/lib32/libXrandr.so.2 $(LIBTMP)/libXrandr.so - ln -s /usr/lib32/liblcms.so.1 $(LIBTMP)/liblcms.so - ln -s /usr/lib32/libpng12.so.0 $(LIBTMP)/libpng.so - ln -s /usr/lib32/libcrypto.so.0.9.8 $(LIBTMP)/libcrypto.so - ln -s /usr/lib32/libssl.so.0.9.8 $(LIBTMP)/libssl.so - ln -s /usr/lib32/libgnutls.so.13 $(LIBTMP)/libgnutls.so - ln -s /usr/lib32/libxml2.so.2 $(LIBTMP)/libxml2.so - ln -s /usr/lib32/libjpeg.so.62 $(LIBTMP)/libjpeg.so - ln -s /usr/lib32/libXcomposite.so.1 $(LIBTMP)/libXcomposite.so - ln -s /usr/lib32/libcups.so.2 $(LIBTMP)/libcups.so - ln -s /usr/lib32/libXcursor.so.1 $(LIBTMP)/libXcursor.so - ln -s /usr/lib32/libdbus-1.so.3 $(LIBTMP)/libdbus-1.so - ln -s /usr/lib32/libhal.so.1 $(LIBTMP)/libhal.so - ln -s /usr/lib32/libsane.so.1 $(LIBTMP)/libsane.so - ln -s /usr/lib32/libgphoto2.so.2 $(LIBTMP)/libgphoto2.so - ln -s /usr/lib32/libgphoto2_port.so.0 $(LIBTMP)/libgphoto2_port.so - ln -s /usr/lib32/libldap-2.4.so.2 $(LIBTMP)/libldap.so - ln -s /usr/lib32/libldap_r-2.4.so.2 $(LIBTMP)/libldap_r.so - ln -s /usr/lib32/liblber-2.4.so.2 $(LIBTMP)/liblber.so - ln -s /usr/lib32/libxslt.so.1 $(LIBTMP)/libxslt.so - ln -s /usr/lib32/libcapi20.so.3 $(LIBTMP)/libcapi20.so - ln -s /usr/lib32/libjack.so.0 $(LIBTMP)/libjack.so - ln -s /usr/lib32/libodbc.so.1 $(LIBTMP)/libodbc.so -endif - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFFLAGS) @@ -127,11 +80,6 @@ [ ! -f Makefile ] || $(MAKE) distclean #-$(MAKE) -C documentation clean - # Clean up our temporary library directory -ifeq ($(DEB_BUILD_ARCH), amd64) - rm -rf $(LIBTMP) -endif - ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif diff -Nru wine-1.1.19~kanotix/debian/wine-dev.install.amd64 wine-1.1.19~kanotix-2/debian/wine-dev.install.amd64 --- wine-1.1.19~kanotix/debian/wine-dev.install.amd64 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine-dev.install.amd64 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/lib32/*.so -usr/include diff -Nru wine-1.1.19~kanotix/debian/wine-dev.install.i386 wine-1.1.19~kanotix-2/debian/wine-dev.install.i386 --- wine-1.1.19~kanotix/debian/wine-dev.install.i386 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine-dev.install.i386 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/lib/*.so -usr/include diff -Nru wine-1.1.19~kanotix/debian/wine-dev.install.lpia wine-1.1.19~kanotix-2/debian/wine-dev.install.lpia --- wine-1.1.19~kanotix/debian/wine-dev.install.lpia 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine-dev.install.lpia 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/lib/*.so -usr/include diff -Nru wine-1.1.19~kanotix/debian/wine.dirs.amd64 wine-1.1.19~kanotix-2/debian/wine.dirs.amd64 --- wine-1.1.19~kanotix/debian/wine.dirs.amd64 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine.dirs.amd64 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -usr/bin -usr/share -usr/share/man -usr/share/man/man1 -usr/share/man/man5 -usr/lib32 -usr/lib32/wine diff -Nru wine-1.1.19~kanotix/debian/wine.dirs.i386 wine-1.1.19~kanotix-2/debian/wine.dirs.i386 --- wine-1.1.19~kanotix/debian/wine.dirs.i386 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine.dirs.i386 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -usr/bin -usr/share -usr/share/man -usr/share/man/man1 -usr/share/man/man5 -usr/lib -usr/lib/wine diff -Nru wine-1.1.19~kanotix/debian/wine.dirs.lpia wine-1.1.19~kanotix-2/debian/wine.dirs.lpia --- wine-1.1.19~kanotix/debian/wine.dirs.lpia 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine.dirs.lpia 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -usr/bin -usr/share -usr/share/man -usr/share/man/man1 -usr/share/man/man5 -usr/lib -usr/lib/wine diff -Nru wine-1.1.19~kanotix/debian/wine.install wine-1.1.19~kanotix-2/debian/wine.install --- wine-1.1.19~kanotix/debian/wine.install 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine.install 2009-04-26 13:43:44.000000000 +0200 @@ -2,3 +2,4 @@ usr/share usr/lib/wine usr/lib/*.so.* +etc/xdg diff -Nru wine-1.1.19~kanotix/debian/wine.install.amd64 wine-1.1.19~kanotix-2/debian/wine.install.amd64 --- wine-1.1.19~kanotix/debian/wine.install.amd64 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine.install.amd64 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -usr/bin -usr/share -usr/lib32/wine -usr/lib32/*.so.* -etc/xdg diff -Nru wine-1.1.19~kanotix/debian/wine.install.i386 wine-1.1.19~kanotix-2/debian/wine.install.i386 --- wine-1.1.19~kanotix/debian/wine.install.i386 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine.install.i386 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -usr/bin -usr/share -usr/lib/wine -usr/lib/*.so.* -etc/xdg diff -Nru wine-1.1.19~kanotix/debian/wine.install.lpia wine-1.1.19~kanotix-2/debian/wine.install.lpia --- wine-1.1.19~kanotix/debian/wine.install.lpia 2009-04-26 13:45:34.000000000 +0200 +++ wine-1.1.19~kanotix-2/debian/wine.install.lpia 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -usr/bin -usr/share -usr/lib/wine -usr/lib/*.so.* -etc/xdg