diff -Naur ia32-libs-20090808/debian/changelog ia32-libs-20090808ubuntu1/debian/changelog --- ia32-libs-20090808/debian/changelog 2009-08-08 19:13:10.000000000 +0200 +++ ia32-libs-20090808ubuntu1/debian/changelog 2010-08-16 15:46:33.000000000 +0200 @@ -1,3 +1,50 @@ +ia32-libs (20090808ubuntu1) maverick; urgency=low + + * Merge with Debian unstable. (LP: #618666) Remaining Ubuntu changes: + - sources.list.deb: Debian -> Ubuntu archive apt sources. + - Add debian/pango.modules and install them in debian/rules. + - debian/rules: + + Depend on lib32bz2-1.0 on amd64 instead of shipping it. + + Depend on lib32v4l package + + Automatically create all missing .so symlinks in /lib32 + and /usr/lib32 as the manual list of links was always out of sync and + incomplete (LP: #277772, #309841). + + Remove the automatically created libstdc++.so symlink, it's not needed. + g++-4.3-multilib provides the right symlink (LP: #360870) + + Add gvfs and symlinks for gio (LP: #369498) + + Add symlink to libGL.so for Wine building (LP: #513554) + + Compress packages with LZMA + - debian/rules, debian/ia32-libs.conf: Add /lib32 and /usr/lib32 to ld + search path. + - fetch-and-build: + + fetch-and-build: Add packages we want/need in Ubuntu. This also + includes SDL and GTK, which are in separate source packages in Debian. + + fetch-and-build: Do not die on source/binary version mismatch when + defining $SOURCE_VER_MISMATCH. Useful right after opening a new Ubuntu + release, when the archive is in heavy flux. + + Dropped: + > libartsc0 (which is now obsolete) + > libxtrap6 (package seems to be gone from the archive) + + Added: + > libgsl0ldbl (LP: #130058) + > libsmbios2 (dependency for libhal1) + > libcelt0-0 (dependency for libjack0) + > libmad0 (LP: #249794) + > libvorbis0a (LP: #249794) + > libvorbisfile3 (LP: #249794) + > libwrap0 (LP: #290533) + * debian/control: Don't Conflict/Replace lib32bz2-1.0, as we depend on it. + * debian/rules: Bump GCC 4.3 to 4.5 to match new lib32gcc1 + * fetch-and-build: + - Added: gtk2-engines-qtcurve. Thanks to Craig Magina (LP: #574476) + - Dropped: libesd-alsa0 (replaced by libesd0) + - Bumped: + + libdirectfb to 1.2-9 from 1.2-0 + + libao2 to libao4 + + odbcinsta1debian1 to odbcinsta1debian2 + + -- Stefano Rivera Mon, 16 Aug 2010 14:37:51 +0200 + ia32-libs (20090808) unstable; urgency=low * Update packages. @@ -21,6 +68,260 @@ -- Mark Hymers Tue, 04 Aug 2009 21:35:25 +0100 +ia32-libs (2.7ubuntu25) lucid; urgency=low + + * Readd libpng symlinks, except to the right targets + * Remove libv4l (there is a lib32v4l package instead) + * Freshen packages + + -- Scott Ritchie Fri, 16 Apr 2010 10:47:37 -0700 + +ia32-libs (2.7ubuntu24) lucid; urgency=low + + * Freshen packages + * Actually remove fix the libpng symlink (LP: #554293) + + -- Scott Ritchie Tue, 13 Apr 2010 09:35:46 -0700 + +ia32-libs (2.7ubuntu23) lucid; urgency=low + + * Freshen packages as the new mesa now uses the correct path for 32 bit + compatibility on 64 bit systems (LP: #248392). + + -- Alberto Milone Sun, 11 Apr 2010 13:44:57 +0000 + +ia32-libs (2.7ubuntu22) lucid; urgency=low + + * Freshen packages + * Add libgnome-keyring0 (LP: #534197) + * Remove manual ln -s libpng12.so.0 libpng.so in rules (LP: #554293) + + -- Scott Ritchie Tue, 06 Apr 2010 11:06:11 -0700 + +ia32-libs (2.7ubuntu21) lucid; urgency=low + + * Freshen packages (LP: #522916) + * Remove libxtrap6 (package seems to be gone from the archive) + * Change gtk2-engines-ubuntulooks to human-theme (replacement package) + * Change libcelt0 to libcelt0-0 + + -- Scott Ritchie Fri, 19 Feb 2010 13:47:16 -0800 + +ia32-libs (2.7ubuntu20) lucid; urgency=low + + * Freshen packages. + * Add libdrm-nouveau1, libdrm-radeon1 (LP: #514299) + * Add libqt4-opengl, libqt4-script, libqt4-scripttools, libqt4-sql, + libqt4-qt3support, libqt4-svg, libqt4-test, libqt4-webkit, + libqt4-xmlpatterns (LP: #490735) + + -- Scott Ritchie Thu, 04 Feb 2010 11:18:19 -0800 + +ia32-libs (2.7ubuntu19) lucid; urgency=low + + * Freshen packages. + * Add symlink to libGL.so for Wine building (LP: #513554) + + -- Scott Ritchie Tue, 02 Feb 2010 13:58:28 -0800 + +ia32-libs (2.7ubuntu18) lucid; urgency=low + + * Freshen packages (LP: #506437). This will also make sure that the mesa + libraries are installed in /usr/lib32/mesa (LP: #506435). + + -- Alberto Milone Wed, 27 Jan 2010 09:30:39 +0000 + +ia32-libs (2.7ubuntu17) karmic; urgency=low + + * Re-add libfltk1.1 as it builds now (LP: #445560) + * Freshen packages + + -- Scott Ritchie Sun, 25 Oct 2009 17:57:55 -0700 + +ia32-libs (2.7ubuntu16) karmic; urgency=low + + * Freshen packages + * Add gvfs and symlinks for gio (LP: #369498) + * Remove libfltk1.1 as it is FTBFS and we can't update it in time for karmic + + -- Scott Ritchie Mon, 12 Oct 2009 16:01:06 -0700 + +ia32-libs (2.7ubuntu15) karmic; urgency=low + + * Add a conflict against lib32asound2-plugins, as this package is being removed + in maric. The conflict also ensures the package goes away with an upgrade from + jaunty + * Freshen packages + + -- Luke Yelavich Tue, 29 Sep 2009 12:09:44 +1000 + +ia32-libs (2.7ubuntu14) karmic; urgency=low + + * Re-add libasound2-plugins (LP: #408615) + * Remove libstdc++5, no longer in karmic + * Freshen packages + + -- Luke Yelavich Mon, 14 Sep 2009 16:55:00 +1000 + +ia32-libs (2.7ubuntu13) karmic; urgency=low + + * debian/rules: + - add symbolic links for gtk-2.0, remove atk-bridge (LP: #369498) + * Add libmpg123-0 + * Add libgstreamer0.10-0 and libgstreamer-plugins-base0.10-0 (LP: #244952) + * Freshen packages (hopefully fixes LP: #425863) + + -- Scott Ritchie Sat, 12 Sep 2009 08:42:21 -0700 + +ia32-libs (2.7ubuntu12) karmic; urgency=low + + * SECURITY UPDATE: refresh packages for libssl0.9.8, libqt4-network, + libnss3-1d regression fix, libvorbis and libgnutls26 + + -- Jamie Strandboge Fri, 11 Sep 2009 13:06:33 +0000 + +ia32-libs (2.7ubuntu11) karmic; urgency=low + + * Add bluez-alsa (LP: #240666) + + -- Scott Ritchie Tue, 11 Aug 2009 22:34:08 -0700 + +ia32-libs (2.7ubuntu10) karmic; urgency=low + + * debian/rules: bump GCC 4.3 to 4.4 to match new lib32gcc1 + + -- Scott Ritchie Tue, 11 Aug 2009 19:12:28 -0700 + +ia32-libs (2.7ubuntu9) karmic; urgency=low + + * Refresh packages + * Add libgsm1 (LP: #411747) + * Add libdrm-intel1 (LP: #352455) + * Add libgail-common (LP: #190227) + + -- Scott Ritchie Mon, 10 Aug 2009 21:11:53 -0700 + +ia32-libs (2.7ubuntu8) karmic; urgency=low + + * SECURITY UPDATE: Refresh packages which pulls in recent NSS fixes + + -- Jamie Strandboge Thu, 06 Aug 2009 13:51:09 +0000 + +ia32-libs (2.7ubuntu7) karmic; urgency=low + + * Update sources.list.deb for karmic. + * Revert gtk+2.0 change from 2.7ubuntu6, as the underlying bug was fixed + in gtk+2.0 2.16.1-0ubuntu3. + * fetch-and-build: + - Add pulseaudio, since libpulsecore moved there. + - Drop libcap1, which is now obsolete. + - Replace libdirectfb-1.0-0 with libdirectfb-1.2-0. + - Replace libkrb53 with libgssapi-krb5-2, libk5crypto3, libkrb5-3, and + libkrb5support0. + - Replace gcc-4.3-base with gcc-4.4-base. + - Replace python2.5 with libpython2.6. + - Replace libdb4.6 with libdb4.7. + - Add libvorbisenc2 for libsndfile1/pulseaudio/pulseaudio-utils. + - Add libv4l-0 for libsane (but just depend on lib32v4l-0 on amd64). + - Add libudev0 for pulseaudio. + * Depend on lib32asound2-plugins on amd64 instead of shipping it (LP: + #305860). + * Depend on lib32bz2-1.0 on amd64 instead of shipping it. + * Freshen packages (LP: #277069, #389510, #393503). + + -- Colin Watson Fri, 17 Jul 2009 15:20:02 +0000 + +ia32-libs (2.7ubuntu6) jaunty; urgency=low + + * debian/rules: gtk+2.0 has a bug in jaunty that builds it with + --host=i686-pc-linux-gnu; to mitigate this we ship a + /usr/lib/gtk-2.0/2.10.0/i686-pc-linux-gnu link instead of the i486 one + previously used; this change should be reverted in karmic (LP: #364074) + + -- Alexander Sack Mon, 20 Apr 2009 11:58:42 +0000 + +ia32-libs (2.7ubuntu5) jaunty; urgency=low + + * Remove the automatically created libstdc++.so symlink, it's not needed. + g++-4.3-multilib provides the right symlink (LP: #360870) + * Freshen packages (as of Jaunty RC) (LP: #362939) + * Drop libfusionsound-1.0-0 which is now obsolete + * Fix typo in the symlink creation code + + -- Fabien Tassin Fri, 17 Apr 2009 18:40:13 +0200 + +ia32-libs (2.7ubuntu4) jaunty; urgency=low + + * fetch-and-build: + - add libsqlite3-0, needed as a dependency of libnss3-1d (LP: #326311). + - add libmikmod2 and libsmpeg0 needed as dependencies of libsdl-mixer1.2 + (LP: #154883). + - add libcanberra-gtk-module and its dependencies (libcanberra-gtk0, + libcanberra0 and libtdb1) + - add libsdl-image1.2 and python2.5 (LP: #277454) + - add missing dependencies: + - libcelt0 for libjack0 + - libsmbios2 for libhal1 + - libspeexdsp1 and liboil0.3 for libpulsecore9 + - libavahi-common3 and libavahi-client3 for libpulse-browse0 + - libgail18 for libgnomecanvas2-0 + - drop libartsc0, which is now obsolete. + * debian/rules: + - automatically create all missing .so symlinks in /lib32 and /usr/lib32 as + the manual list of links was always out of sync and incomplete + (LP: #277772, #309841). + * Freshen packages (as of Jaunty beta1) (LP: #338145, #325098, #337210) + + -- Fabien Tassin Fri, 20 Mar 2009 23:48:50 +0100 + +ia32-libs (2.7ubuntu3) jaunty; urgency=low + + * fetch-and-build: + - add libgdbm3, needed as a dependency of libpulse. LP: #314739. + - drop libxcb-xlib0, which is now obsolete. + - replace libpulsecore8 with libpulsecore9 + + -- Steve Langasek Tue, 27 Jan 2009 00:34:20 +0000 + +ia32-libs (2.7ubuntu2) jaunty; urgency=low + + * fetch-and-build: (LP: #298611) + - Added (LP: #249794) + + libmad0 + + libvorbis0a + + libvorbisfile3 + + libuuid1 + + libwrap0 (LP: #290533) + + libgsl0ldbl (LP: #130058) + - Updated + - libpulsecore8 + * This (or the last merge) upload closes as well: + - Provide library symlinks for building 32-bit code (LP: #277772) + + -- Stephan Hermann Tue, 16 Dec 2008 09:33:10 +0000 + +ia32-libs (2.7ubuntu1) jaunty; urgency=low + + * Merge with Debian unstable. Remaining Ubuntu changes: + - fetch-and-build: Add packages we want/need in Ubuntu. This also includes + SDL and GTK, which are in separate source packages in Debian. + - fetch-and-build: Do not die on source/binary version mismatch when + defining $SOURCE_VER_MISMATCH. Useful right after opening a new Ubuntu + release, when the archive is in heavy flux. + - sources.list.deb: Debian -> Ubuntu archive apt sources. + - Compress packages with LZMA: + + debian/rules: Supply lzma option to dh_builddeb. + + debian/control: Set appropriate dpkg Pre-Depends. + - Add debian/{gdk-pixbuf.loaders.32,gtk.immodules.32,pango.modules} and + install them in debian/rules. + - debian/rules: Add locale symlink. (LP #126044) + - debian/rules, debian/ia32-libs.conf: Add /lib32 and /usr/lib32 to ld + search path. + - debian/rules: Add rule to autogenerate debian/copyright. + - debian/copyright: Autogenerated with "debian/rules copyright". + + -- Martin Pitt Thu, 13 Nov 2008 18:59:06 +0000 + ia32-libs (2.7) unstable; urgency=low * Freshen packages. @@ -396,7 +697,7 @@ * Build libgcc1, but only ship it if uname -m == ia64. -- Tollef Fog Heen Sun, 29 Aug 2004 11:18:56 +0200 - + ia32-libs (0.5ubuntu2) warty; urgency=low * Don't ship libstdc++, it's provided by the lib32stdc++5 package, @@ -450,3 +751,4 @@ * Initial Release. Debian-specific, ia64-only package. -- Bdale Garbee Fri, 23 Nov 2001 14:17:02 -0700 + diff -Naur ia32-libs-20090808/debian/control ia32-libs-20090808ubuntu1/debian/control --- ia32-libs-20090808/debian/control 2009-08-08 18:35:15.000000000 +0200 +++ ia32-libs-20090808ubuntu1/debian/control 2010-08-16 15:45:30.000000000 +0200 @@ -1,7 +1,8 @@ Source: ia32-libs Section: libs Priority: extra -Maintainer: Debian ia32-libs Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian ia32-libs Team Uploaders: Bdale Garbee , Goswin von Brederlow , Frederik Schüler Build-Depends: debhelper (>> 4.0.0), dpkg-dev (>= 1.10.23), lsb-release, dctrl-tools Standards-Version: 3.6.2.0 @@ -10,9 +11,10 @@ Architecture: amd64 ia64 Pre-Depends: dpkg (>= 1.13.21), libc6-i386 (>= 2.9-18) [amd64] Depends: lsb-release, lib32gcc1, ${lib:Depends} -Replaces: ia32-libs-openoffice.org, ia32-libs-dev (<< 1.6), nvidia-glx-ia32 (<< 1.0.8774-7), ia32-freeglut3, ia32-lesstif2, ia32-libacl1, ia32-libaio1, ia32-libartsc0, ia32-libasyncns0, ia32-libattr1, ia32-libaudio2, ia32-libaudiofile0, ia32-libcairo2, ia32-libcap2, ia32-libcapi20-3, ia32-libcomerr2, ia32-libcups2, ia32-libdbus-1-3, ia32-libdirectfb-1.2-0, ia32-libdrm2, ia32-libesd0, ia32-libexif12, ia32-libexpat1, ia32-libfltk1.1, ia32-libfontconfig1, ia32-libfreetype6, ia32-libgcrypt11, ia32-libgl1-mesa-dri, ia32-libgl1-mesa-glx, ia32-libglu1-mesa, ia32-libgnutls26, ia32-libgpg-error0, ia32-libgphoto2-2, ia32-libgphoto2-port0, ia32-libgssapi-krb5-2, ia32-libhal1, ia32-libice6, ia32-libieee1284-3, ia32-libjack0, ia32-libjpeg62, ia32-libk5crypto3, ia32-libkeyutils1, ia32-libkrb5-3, ia32-libkrb5support0, ia32-liblcms1, ia32-libldap-2.4-2, ia32-libltdl7, ia32-liblzo2-2, ia32-libnss-ldap, ia32-libpam0g, ia32-libpam-ldap, ia32-libpng12-0, ia32-libpopt0, ia32-libpulse0, ia32-libsane, ia32-libsasl2-2, ia32-libsdl1.2debian-alsa, ia32-libselinux1, ia32-libsigc++-2.0-0c2a, ia32-libsm6, ia32-libssl0.9.8, ia32-libstdc++5, ia32-libsvga1, ia32-libtasn1-3, ia32-libtiff4, ia32-libusb-0.1-4, ia32-libuuid1, ia32-libwmf0.2-7, ia32-libx11-6, ia32-libx86-1, ia32-libxau6, ia32-libxaw7, ia32-libxcb1, ia32-libxcb-render0, ia32-libxcb-render-util0, ia32-libxcomposite1, ia32-libxcursor1, ia32-libxdamage1, ia32-libxdmcp6, ia32-libxext6, ia32-libxfixes3, ia32-libxft2, ia32-libxi6, ia32-libxinerama1, ia32-libxml2, ia32-libxmu6, ia32-libxmuu1, ia32-libxp6, ia32-libxpm4, ia32-libxrandr2, ia32-libxrender1, ia32-libxslt1.1, ia32-libxss1, ia32-libxt6, ia32-libxtrap6, ia32-libxtst6, ia32-libxv1, ia32-libxxf86vm1, ia32-odbcinst1debian1, ia32-unixodbc, ia32-xaw3dg, lib32bz2-1.0 -Conflicts: ia32-libs-dev (<< 1.6), nvidia-glx-ia32 (<< 1.0.8774-7), ia32-freeglut3, ia32-lesstif2, ia32-libacl1, ia32-libaio1, ia32-libartsc0, ia32-libasyncns0, ia32-libattr1, ia32-libaudio2, ia32-libaudiofile0, ia32-libcairo2, ia32-libcap2, ia32-libcapi20-3, ia32-libcomerr2, ia32-libcups2, ia32-libdbus-1-3, ia32-libdirectfb-1.2-0, ia32-libdrm2, ia32-libesd0, ia32-libexif12, ia32-libexpat1, ia32-libfltk1.1, ia32-libfontconfig1, ia32-libfreetype6, ia32-libgcrypt11, ia32-libgl1-mesa-dri, ia32-libgl1-mesa-glx, ia32-libglu1-mesa, ia32-libgnutls26, ia32-libgpg-error0, ia32-libgphoto2-2, ia32-libgphoto2-port0, ia32-libgssapi-krb5-2, ia32-libhal1, ia32-libice6, ia32-libieee1284-3, ia32-libjack0, ia32-libjpeg62, ia32-libk5crypto3, ia32-libkeyutils1, ia32-libkrb5-3, ia32-libkrb5support0, ia32-liblcms1, ia32-libldap-2.4-2, ia32-libltdl7, ia32-liblzo2-2, ia32-libnss-ldap, ia32-libpam0g, ia32-libpam-ldap, ia32-libpng12-0, ia32-libpopt0, ia32-libpulse0, ia32-libsane, ia32-libsasl2-2, ia32-libsdl1.2debian-alsa, ia32-libselinux1, ia32-libsigc++-2.0-0c2a, ia32-libsm6, ia32-libssl0.9.8, ia32-libstdc++5, ia32-libsvga1, ia32-libtasn1-3, ia32-libtiff4, ia32-libusb-0.1-4, ia32-libuuid1, ia32-libwmf0.2-7, ia32-libx11-6, ia32-libx86-1, ia32-libxau6, ia32-libxaw7, ia32-libxcb1, ia32-libxcb-render0, ia32-libxcb-render-util0, ia32-libxcomposite1, ia32-libxcursor1, ia32-libxdamage1, ia32-libxdmcp6, ia32-libxext6, ia32-libxfixes3, ia32-libxft2, ia32-libxi6, ia32-libxinerama1, ia32-libxml2, ia32-libxmu6, ia32-libxmuu1, ia32-libxp6, ia32-libxpm4, ia32-libxrandr2, ia32-libxrender1, ia32-libxslt1.1, ia32-libxss1, ia32-libxt6, ia32-libxtrap6, ia32-libxtst6, ia32-libxv1, ia32-libxxf86vm1, ia32-odbcinst1debian1, ia32-unixodbc, ia32-xaw3dg, lib32bz2-1.0 +Replaces: ia32-libs-openoffice.org, ia32-libs-dev (<< 1.6), nvidia-glx-ia32 (<< 1.0.8774-7), ia32-freeglut3, ia32-lesstif2, ia32-libacl1, ia32-libaio1, ia32-libartsc0, ia32-libasyncns0, ia32-libattr1, ia32-libaudio2, ia32-libaudiofile0, ia32-libcairo2, ia32-libcap2, ia32-libcapi20-3, ia32-libcomerr2, ia32-libcups2, ia32-libdbus-1-3, ia32-libdirectfb-1.2-0, ia32-libdrm2, ia32-libesd0, ia32-libexif12, ia32-libexpat1, ia32-libfltk1.1, ia32-libfontconfig1, ia32-libfreetype6, ia32-libgcrypt11, ia32-libgl1-mesa-dri, ia32-libgl1-mesa-glx, ia32-libglu1-mesa, ia32-libgnutls26, ia32-libgpg-error0, ia32-libgphoto2-2, ia32-libgphoto2-port0, ia32-libgssapi-krb5-2, ia32-libhal1, ia32-libice6, ia32-libieee1284-3, ia32-libjack0, ia32-libjpeg62, ia32-libk5crypto3, ia32-libkeyutils1, ia32-libkrb5-3, ia32-libkrb5support0, ia32-liblcms1, ia32-libldap-2.4-2, ia32-libltdl7, ia32-liblzo2-2, ia32-libnss-ldap, ia32-libpam0g, ia32-libpam-ldap, ia32-libpng12-0, ia32-libpopt0, ia32-libpulse0, ia32-libsane, ia32-libsasl2-2, ia32-libsdl1.2debian-alsa, ia32-libselinux1, ia32-libsigc++-2.0-0c2a, ia32-libsm6, ia32-libssl0.9.8, ia32-libstdc++5, ia32-libsvga1, ia32-libtasn1-3, ia32-libtiff4, ia32-libusb-0.1-4, ia32-libuuid1, ia32-libwmf0.2-7, ia32-libx11-6, ia32-libx86-1, ia32-libxau6, ia32-libxaw7, ia32-libxcb1, ia32-libxcb-render0, ia32-libxcb-render-util0, ia32-libxcomposite1, ia32-libxcursor1, ia32-libxdamage1, ia32-libxdmcp6, ia32-libxext6, ia32-libxfixes3, ia32-libxft2, ia32-libxi6, ia32-libxinerama1, ia32-libxml2, ia32-libxmu6, ia32-libxmuu1, ia32-libxp6, ia32-libxpm4, ia32-libxrandr2, ia32-libxrender1, ia32-libxslt1.1, ia32-libxss1, ia32-libxt6, ia32-libxtrap6, ia32-libxtst6, ia32-libxv1, ia32-libxxf86vm1, ia32-odbcinst1debian1, ia32-unixodbc, ia32-xaw3dg +Conflicts: ia32-libs-dev (<< 1.6), nvidia-glx-ia32 (<< 1.0.8774-7), ia32-freeglut3, ia32-lesstif2, ia32-libacl1, ia32-libaio1, ia32-libartsc0, ia32-libasyncns0, ia32-libattr1, ia32-libaudio2, ia32-libaudiofile0, ia32-libcairo2, ia32-libcap2, ia32-libcapi20-3, ia32-libcomerr2, ia32-libcups2, ia32-libdbus-1-3, ia32-libdirectfb-1.2-0, ia32-libdrm2, ia32-libesd0, ia32-libexif12, ia32-libexpat1, ia32-libfltk1.1, ia32-libfontconfig1, ia32-libfreetype6, ia32-libgcrypt11, ia32-libgl1-mesa-dri, ia32-libgl1-mesa-glx, ia32-libglu1-mesa, ia32-libgnutls26, ia32-libgpg-error0, ia32-libgphoto2-2, ia32-libgphoto2-port0, ia32-libgssapi-krb5-2, ia32-libhal1, ia32-libice6, ia32-libieee1284-3, ia32-libjack0, ia32-libjpeg62, ia32-libk5crypto3, ia32-libkeyutils1, ia32-libkrb5-3, ia32-libkrb5support0, ia32-liblcms1, ia32-libldap-2.4-2, ia32-libltdl7, ia32-liblzo2-2, ia32-libnss-ldap, ia32-libpam0g, ia32-libpam-ldap, ia32-libpng12-0, ia32-libpopt0, ia32-libpulse0, ia32-libsane, ia32-libsasl2-2, ia32-libsdl1.2debian-alsa, ia32-libselinux1, ia32-libsigc++-2.0-0c2a, ia32-libsm6, ia32-libssl0.9.8, ia32-libstdc++5, ia32-libsvga1, ia32-libtasn1-3, ia32-libtiff4, ia32-libusb-0.1-4, ia32-libuuid1, ia32-libwmf0.2-7, ia32-libx11-6, ia32-libx86-1, ia32-libxau6, ia32-libxaw7, ia32-libxcb1, ia32-libxcb-render0, ia32-libxcb-render-util0, ia32-libxcomposite1, ia32-libxcursor1, ia32-libxdamage1, ia32-libxdmcp6, ia32-libxext6, ia32-libxfixes3, ia32-libxft2, ia32-libxi6, ia32-libxinerama1, ia32-libxml2, ia32-libxmu6, ia32-libxmuu1, ia32-libxp6, ia32-libxpm4, ia32-libxrandr2, ia32-libxrender1, ia32-libxslt1.1, ia32-libxss1, ia32-libxt6, ia32-libxtrap6, ia32-libxtst6, ia32-libxv1, ia32-libxxf86vm1, ia32-odbcinst1debian1, ia32-unixodbc, ia32-xaw3dg Suggests: ia32-libs-gtk +Provides: ia32-libs-gtk, ia32-libs-sdl Description: ia32 shared libraries for use on amd64 and ia64 systems This package contains runtime libraries for the ia32/i386 architecture, configured for use on an amd64 or ia64 Debian system running diff -Naur ia32-libs-20090808/debian/ia32-libs.conf ia32-libs-20090808ubuntu1/debian/ia32-libs.conf --- ia32-libs-20090808/debian/ia32-libs.conf 1970-01-01 02:00:00.000000000 +0200 +++ ia32-libs-20090808ubuntu1/debian/ia32-libs.conf 2010-08-16 13:09:43.000000000 +0200 @@ -0,0 +1,3 @@ +/usr/local/lib32 +/lib32 +/usr/lib32 diff -Naur ia32-libs-20090808/debian/pango.modules ia32-libs-20090808ubuntu1/debian/pango.modules --- ia32-libs-20090808/debian/pango.modules 1970-01-01 02:00:00.000000000 +0200 +++ ia32-libs-20090808ubuntu1/debian/pango.modules 2010-08-16 15:01:23.000000000 +0200 @@ -0,0 +1,32 @@ +# automatically generated by dh_pangomodules, do not edit +/usr/lib32/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* +/usr/lib32/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* +/usr/lib32/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: +/usr/lib32/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common: +/usr/lib32/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* +/usr/lib32/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* +/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* +/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* +/usr/lib32/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* +/usr/lib32/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* +/usr/lib32/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* +/usr/lib32/pango/1.6.0/modules/pango-thai-lang.so ThaiScriptEngineLang PangoEngineLang PangoRenderNone thai:* +/usr/lib32/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* diff -Naur ia32-libs-20090808/debian/rules ia32-libs-20090808ubuntu1/debian/rules --- ia32-libs-20090808/debian/rules 2009-08-08 19:33:08.000000000 +0200 +++ ia32-libs-20090808ubuntu1/debian/rules 2010-08-16 15:26:19.000000000 +0200 @@ -16,8 +16,8 @@ # On amd64 some package compile 32bit debs directly. # Skip converting them and Depend on them instead. ifeq (amd64,$(DEB_HOST_ARCH)) - lib_depends = libc6-i386 (>= 2.3.6-2), lib32z1, lib32stdc++6, lib32asound2, lib32ncurses5 - FILTER = zlib1g libc6 libgcc1 libasound2 libstdc++6 libncurses5 + lib_depends = libc6-i386 (>= 2.3.6-2), lib32z1, lib32stdc++6, lib32asound2, lib32bz2-1.0, lib32ncurses5, lib32v4l-0 + FILTER = zlib1g libc6 libgcc1 libasound2 libbz2-1.0 libstdc++6 libncurses5 libv4l-0 EXTRA_INSTALL = else lib_depends = @@ -53,7 +53,7 @@ DEBS_ia32-libs := $(filter-out %-dev $(FILTER),$(DEBS_ALL)) DEBS_ia32-libs-dev := $(filter %-dev,$(DEBS_ALL)) -DEBS_lib32gcc1 := libgcc1 gcc-4.3-base +DEBS_lib32gcc1 := libgcc1 gcc-4.5-base EXTRACT_ia32-libs := $(addprefix extract-,$(DEBS_ia32-libs)) EXTRACT_ia32-libs-dev := $(addprefix extract-,$(DEBS_ia32-libs-dev)) @@ -133,7 +133,11 @@ # Link the ld.so into place mkdir -p $(DEST)/lib/ - ln -s $(ROOT)lib$(SUFFIX)/ld-2.3.2.so $(DEST)/lib/ld-linux.so.2 + ln -s $(ROOT)lib$(SUFFIX)/ld-linux.so.2 $(DEST)/lib/ld-linux.so.2 + + # Add /lib32 and /usr/lib32 to ld search path + mkdir -p $(DEST)/etc/ld.so.conf.d + cp -p debian/ia32-libs.conf $(DEST)/etc/ld.so.conf.d/ ifneq (/,$(ROOT)) # Move uname into place @@ -148,67 +152,66 @@ # Add locale symlink ln -s /usr/lib/locale $(DEST)$(ROOT)usr/lib$(SUFFIX)/locale - # Add symlinks for wine and znes compiling - cd $(DEST)$(ROOT)usr/lib$(SUFFIX) && \ - ln -s libGL.so.1 libGL.so && \ - ln -s libGLU.so.1 libGLU.so && \ - ln -s libICE.so.6 libICE.so && \ - ln -s libSM.so.6 libSM.so && \ - ln -s libX11.so.6 libX11.so && \ - ln -s libXau.so.6 libXau.so && \ - ln -s libXcursor.so.1 libXcursor.so && \ - ln -s libXdmcp.so.6 libXdmcp.so && \ - ln -s libXext.so.6 libXext.so && \ - ln -s libXfixes.so.3 libXfixes.so && \ - ln -s libXi.so.6 libXi.so && \ - ln -s libXinerama.so.1 libXinerama.so && \ - ln -s libXmu.so.6 libXmu.so && \ - ln -s libXrandr.so.2 libXrandr.so && \ - ln -s libXrender.so.1 libXrender.so && \ - ln -s libXt.so.6 libXt.so && \ - ln -s libXxf86vm.so.1 libXxf86vm.so && \ - ln -s libartsc.so.0 libartsc.so && \ - ln -s libaudiofile.so.0 libaudiofile.so && \ - ln -s libaudio.so.2 libaudio.so && \ - ln -s libcairo.so.2 libcairo.so && \ - ln -s libesd.so.0 libesd.so && \ - ln -s libexif.so.12 libexif.so && \ - ln -s libfontconfig.so.1 libfontconfig.so && \ - ln -s libfreetype.so.6 libfreetype.so && \ - ln -s libgcrypt.so.11 libgcrypt.so && \ - ln -s libglut.so.3 libglut.so && \ - ln -s libgnutls.so.26 libgnutls.so && \ - ln -s libgpg-error.so.0 libgpg-error.so && \ - ln -s libgphoto2_port.so.0 libgphoto2_port.so && \ - ln -s libgphoto2.so.2 libgphoto2.so && \ - ln -s libieee1284.so.3 libieee1284.so && \ - ln -s libjpeg.so.62 libjpeg.so && \ - ln -s liblber-2.4.so.2 liblber.so && \ - ln -s liblcms.so.1 liblcms.so && \ - ln -s libldap_r-2.4.so.2 libldap_r.so && \ - ln -s libltdl.so.7 libltdl.so && \ - ln -s libsane.so.1 libsane.so && \ - ln -s libsasl2.so.2 libsasl2.so && \ - ln -s libtasn1.so.3 libtasn1.so && \ - ln -s libtiff.so.4 libtiff.so && \ - ln -s libxml2.so.2 libxml2.so && \ - ln -s libxslt.so.1 libxslt.so && \ - ln -s libSDL-1.2.so.0 libSDL-1.2.so && \ - ln -s libpng12.so.0 libpng12.so && \ - ln -s libpng12.so.0 libpng.so && \ - ln -s libcups.so.2 libcups.so && \ - ln -s libpulse.so.0.4.1 libpulse.so && \ - ln -s libpulse-simple.so.0.0.1 libpulse-simple.so && \ - ln -s libssl.so.0.9.8 libssl.so && \ - ln -s libXcomposite.so.1 libXcomposite.so && \ - ln -s libhal.so.1 libhal.so && \ - ln -s libcapi20.so.3 libcapi20.so && \ - ln -s libjack.so.0 libjack.so && \ - ln -s libcrypto.so.0.9.8 libcrypto.so - - cd $(DEST)$(ROOT)lib$(SUFFIX) && \ - ln -s libusb-0.1.so.4 libusb.so && \ - ln -s libcap.so.2 libcap.so + # Add a ".so" symlink to each shared lib lacking one + for where in usr/lib lib ; do \ + echo "* doing /$${where}$(SUFFIX)" ; \ + cd $(CURDIR)/$(DEST)$(ROOT)$${where}$(SUFFIX)/ && \ + for lib in $$(find . -maxdepth 1 -type f -name \*.so\* | sort) ; do \ + SO=$$(echo $$lib | sed -e 's/\(\.so\)\.[.0-9]*$$/\1/') ; \ + if [ "Z$$SO" != "Z$$lib" ] ; then \ + if [ ! -e $$SO ] ; then \ + SSO=$$(find . -lname $$(basename $$lib) | head -1) ; \ + if [ "Z$$SSO" != Z ] ; then \ + ln -vs $$SSO $$SO ; \ + else \ + ln -vs $$lib $$SO ; \ + fi \ + fi \ + fi \ + done \ + done + + # More symlinks, not covered by the code above + cd $(DEST)$(ROOT)/usr/lib$(SUFFIX)/ && \ + ln -s /lib32/libpng12.so.0 libpng.so && \ + ln -s /lib32/libpng12.so.0 libpng12.so && \ + ln -s liblber-2.4.so liblber.so && \ + ln -s libldap_r-2.4.so libldap_r.so + + cd $(DEST)$(ROOT)/lib$(SUFFIX)/ && \ + ln -s libusb-0.1.so libusb.so + + # Drop the libstdc++.so symlink, it's provided by g++-4.4-multilib (LP: #360870) + cd $(DEST)$(ROOT)/usr/lib$(SUFFIX)/ && \ + rm -f libstdc++.so + + # Provide proper links for gtk modules (LP: #369498) + dh_link -pia32-libs /usr/lib32/gtk-2.0/2.10.0 /usr/lib/gtk-2.0/2.10.0/i486-pc-linux-gnu + dh_link -pia32-libs /usr/lib32/gtk-2.0/ /usr/lib/gtk-2.0/i486-pc-linux-gnu + dh_link -pia32-libs /usr/lib32/gtk-2.0/2.10.0 /usr/lib/gtk-2.0/2.10.0/i686-pc-linux-gnu + dh_link -pia32-libs /usr/lib32/gtk-2.0/ /usr/lib/gtk-2.0/i686-pc-linux-gnu + + # Remove atk-bridge module (LP: #369498) + rm $(DEST)$(ROOT)usr/lib32/gtk-2.0/modules/libatk-bridge.so + + # Provide proper links for libglib2 (LP: #369498) + dh_link -pia32-libs /usr/lib32/gio/modules /usr/lib/gio/modules/i486-pc-linux-gnu + dh_link -pia32-libs /usr/lib32/gio/modules /usr/lib/gio/modules/i686-pc-linux-gnu + + # Provide proper links for libGL (LP: #513554) + dh_link -pia32-libs /usr/lib32/mesa/libGL.so.1 /usr/lib32/libGL.so + + # verify and install pango.modules + PANGOMODS=$$(dpkg-deb -c pkgs/libpango*i386.deb | grep modules/pango | cut -d. -f2- | sed -e 's,/lib/,/lib32/,'); \ + for i in $$(grep -v ^'#' debian/pango.modules | cut -d" " -f1 | sort -u); \ + do \ + if ! echo "$$PANGOMODS" | grep -q ^$$i; then \ + echo "ERROR: Pango module $$i not listed in libpango package." >&2 ; \ + echo "Please update debian/pango.modules" >&2; \ + exit 1; \ + fi; \ + done + install -m644 debian/pango.modules debian/ia32-libs/usr/lib32/pango/1.6.0/module-files.d/libpango1.0-0.modules # Remove unwanted directories and pt_chown rm -rf $(DEST)/t @@ -270,14 +273,14 @@ mkdir $(DEST)/usr/share/doc/lib32gcc1 rm -f $(DEST)/usr/share/doc/libgcc1 ( set -e; for FILE in copyright changelog.Debian.gz; do \ - mv $(DEST)/usr/share/doc/gcc-4.3-base/$$FILE $(DEST)/usr/share/doc/lib32gcc1/lib32gcc1.$$FILE; \ + mv $(DEST)/usr/share/doc/gcc-4.5-base/$$FILE $(DEST)/usr/share/doc/lib32gcc1/lib32gcc1.$$FILE; \ done ) - rm -rf $(DEST)/usr/share/doc/gcc-4.3-base + rm -rf $(DEST)/usr/share/doc/gcc-4.5-base # Remove unwanted directories and contents rm -r $(DEST)/t - #rm $(DEST)/usr/share/doc/gcc-4.3-base/.changelog.Debian.gz - #rm $(DEST)/usr/share/doc/gcc-4.3-base/.copyright + #rm $(DEST)/usr/share/doc/gcc-4.5-base/.changelog.Debian.gz + #rm $(DEST)/usr/share/doc/gcc-4.5-base/.copyright # Fix symlinks. $(MAKE) DEST=$(DEST) fix-links @@ -316,7 +319,7 @@ dh_gencontrol -plib32gcc1 -- -v$(LIB32GCC_VERSION) endif dh_md5sums -s - dh_builddeb -s + dh_builddeb -s -- -Zlzma binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff -Naur ia32-libs-20090808/fetch-and-build ia32-libs-20090808ubuntu1/fetch-and-build --- ia32-libs-20090808/fetch-and-build 2009-08-08 14:05:49.000000000 +0200 +++ ia32-libs-20090808ubuntu1/fetch-and-build 2010-08-16 15:09:44.000000000 +0200 @@ -10,17 +10,15 @@ DEBS="coreutils freeglut3 -gcc-4.3-base +gcc-4.5-base lesstif2 libacl1 libaio1 libasyncns0 libattr1 -libartsc0 libasound2 libaudio2 libaudiofile0 -libbz2-1.0 libc6 libc6-dev libcairo2 @@ -29,7 +27,7 @@ libcomerr2 libcups2 libdbus-1-3 -libdirectfb-1.2-0 +libdirectfb-1.2-9 libdrm2 libesd0 libexif12 @@ -47,10 +45,13 @@ libgpg-error0 libgphoto2-2 libgphoto2-port0 +libgsl0ldbl libhal1 +libsmbios2 libice6 libieee1284-3 libjack0 +libcelt0-0 libjpeg62 libkeyutils1 libkrb5support0 @@ -61,6 +62,7 @@ libldap-2.4-2 libltdl7 liblzo2-2 +libmad0 libncurses5 libnss-ldap libpam0g @@ -82,13 +84,16 @@ libtiff4 libusb-0.1-4 libuuid1 +libvorbis0a +libvorbisfile3 libwmf0.2-7 +libwrap0 libx11-6 libx86-1 libxau6 libxaw7 -libxcb1 -libxcb-render0 +libxcb1 +libxcb-render0 libxcb-render-util0 libxcomposite1 libxdamage1 @@ -106,14 +111,13 @@ libxrandr2 libxrender1 libxt6 -libxtrap6 libxtst6 libxv1 libxcursor1 libxslt1.1 libxss1 libxxf86vm1 -odbcinst1debian1 +odbcinst1debian2 unixodbc xaw3dg xbitmaps @@ -121,6 +125,102 @@ zlib1g " +# additional packages for Ubuntu +DEBS="$DEBS +at-spi +bluez-alsa +gtk2-engines +gtk2-engines-murrine +gtk2-engines-pixbuf +gtk2-engines-qtcurve +human-theme +gvfs +libcanberra-gtk-module +libcanberra-gtk0 +libcanberra0 +libtdb1 +libao4 +libart-2.0-2 +libasound2-plugins +libatspi1.0-0 +libatk1.0-0 +libbonobo2-0 +libbonobo2-common +libbluetooth3 +libcroco3 +libcupsimage2 +libcurl3 +libdb4.7 +libdbus-glib-1-2 +libdrm-intel1 +libdrm-radeon1 +libdrm-nouveau1 +libflac8 +libgconf2-4 +libgdbm3 +libglade2-0 +libglib2.0-0 +libgnomecanvas2-0 +libgnome-keyring0 +libgail18 +libgail-common +libgsf-1-114 +libgsm1 +libgstreamer0.10-0 +libgstreamer-plugins-base0.10-0 +libgtk2.0-0 +libidl0 +libidn11 +libmpg123-0 +libsqlite3-0 +libnspr4-0d +libnss3-1d +libogg0 +libopenal1 +liborbit2 +libpango1.0-0 +libpcre3 +libpixman-1-0 +libpulse-browse0 +libpulse-mainloop-glib0 +pulseaudio +libavahi-common3 +libavahi-client3 +libspeexdsp1 +liboil0.3 +libqtcore4 +libqtgui4 +libqt4-dbus +libqt4-network +libqt4-opengl +libqt4-qt3support +libqt4-script +libqt4-scripttools +libqt4-sql +libqt4-svg +libqt4-test +libqt4-webkit +libqt4-xml +libqt4-xmlpatterns +librsvg2-common +librsvg2-2 +libsamplerate0 +libsdl-mixer1.2 +libsdl-image1.2 +libpython2.6 +libmikmod2 +libsmpeg0 +libsdl-net1.2 +libsdl-ttf2.0-0 +libsdl1.2-dev +libsepol1 +libsndfile1 +libssh2-1 +libudev0 +libvorbisenc2 +pulseaudio-utils +" + export APTDIR=$(mktemp -d) mkdir -p $APTDIR @@ -219,7 +319,12 @@ *) SRC="$VAL";; esac;; "") echo >&2 "Fetching source $SRC $VER for $PKG" - echo "$SRC=$VER";; + if [ "$SOURCE_VER_MISMATCH" ]; then + echo "$SRC" + else + echo "$SRC=$VER" + fi + ;; esac done \ | sort -u | (cd srcs; xargs $APT_GET -d source) || exit 1 # Fetch source diff -Naur ia32-libs-20090808/sources.list.deb ia32-libs-20090808ubuntu1/sources.list.deb --- ia32-libs-20090808/sources.list.deb 2009-07-25 20:54:02.000000000 +0200 +++ ia32-libs-20090808ubuntu1/sources.list.deb 2010-08-16 14:42:12.000000000 +0200 @@ -1,2 +1,6 @@ -deb http://ftp.de.debian.org/debian sid main -deb-src http://ftp.de.debian.org/debian sid main +deb http://archive.ubuntu.com/ubuntu maverick main universe +deb http://archive.ubuntu.com/ubuntu maverick-updates main universe +deb http://security.ubuntu.com/ubuntu maverick-security main universe +deb-src http://archive.ubuntu.com/ubuntu maverick main universe +deb-src http://archive.ubuntu.com/ubuntu maverick-updates main universe +deb-src http://security.ubuntu.com/ubuntu maverick-security main universe