On Mon, May 14, 2012 at 12:39:46PM +0200, Jonas Smedegaard wrote: > It seems you forgot the patch, though :-)
Ups. I should not only write, but actually attach the patch. Bastian -- Beam me up, Scotty! It ate my phaser!
diff -Nru libgd2-2.0.36~rc1~dfsg/debian/changelog libgd2-2.0.36~rc1~dfsg/debian/changelog --- libgd2-2.0.36~rc1~dfsg/debian/changelog 2011-10-15 20:23:44.000000000 +0000 +++ libgd2-2.0.36~rc1~dfsg/debian/changelog 2012-05-14 08:44:16.000000000 +0000 @@ -1,3 +1,14 @@ +libgd2 (2.0.36~rc1~dfsg-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Support multi-arch: (closes: #652496) + - Mark libgd2-xpm, libgd2-noxpm, libgd2-xpm-dev and libgd2-noxpm-dev + as same. + - Adjust d-shlibs and dh-buildinfo build-dependency. + * Drop .la files. + + -- Bastian Blank <[email protected]> Sun, 13 May 2012 09:16:37 +0000 + libgd2 (2.0.36~rc1~dfsg-6) unstable; urgency=low * Acknowledge NMU. diff -Nru libgd2-2.0.36~rc1~dfsg/debian/control libgd2-2.0.36~rc1~dfsg/debian/control --- libgd2-2.0.36~rc1~dfsg/debian/control 2011-10-15 20:20:10.000000000 +0000 +++ libgd2-2.0.36~rc1~dfsg/debian/control 2012-05-14 08:44:36.000000000 +0000 @@ -7,7 +7,7 @@ gnulib, cdbs (>= 0.4.72~), debhelper, - dh-buildinfo, + dh-buildinfo (>= 0.9+nmu1~), devscripts, libpng12-dev, libz-dev, @@ -17,7 +17,7 @@ libx11-dev, libxt-dev, libfontconfig-dev, - d-shlibs, + d-shlibs (>= 0.48~), html2text Vcs-Git: git://git.debian.org/git/collab-maint/libgd2 Vcs-Browser: http://git.debian.org/?p=collab-maint/libgd2.git;a=summary @@ -40,6 +40,7 @@ Package: libgd2-xpm-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libgd2-xpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-noxpm-dev @@ -56,6 +57,7 @@ Package: libgd2-noxpm-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libgd2-noxpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-xpm-dev @@ -72,7 +74,9 @@ Package: libgd2-xpm Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-noxpm Provides: libgd2 @@ -89,7 +93,9 @@ Package: libgd2-noxpm Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-xpm Provides: libgd2 diff -Nru libgd2-2.0.36~rc1~dfsg/debian/control.in libgd2-2.0.36~rc1~dfsg/debian/control.in --- libgd2-2.0.36~rc1~dfsg/debian/control.in 2011-10-15 20:20:10.000000000 +0000 +++ libgd2-2.0.36~rc1~dfsg/debian/control.in 2012-05-13 09:13:23.000000000 +0000 @@ -25,6 +25,7 @@ Package: libgd2-xpm-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libgd2-xpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-noxpm-dev @@ -41,6 +42,7 @@ Package: libgd2-noxpm-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libgd2-noxpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-xpm-dev @@ -57,7 +59,9 @@ Package: libgd2-xpm Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-noxpm Provides: libgd2 @@ -74,7 +78,9 @@ Package: libgd2-noxpm Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-xpm Provides: libgd2 diff -Nru libgd2-2.0.36~rc1~dfsg/debian/rules libgd2-2.0.36~rc1~dfsg/debian/rules --- libgd2-2.0.36~rc1~dfsg/debian/rules 2011-10-15 20:20:10.000000000 +0000 +++ libgd2-2.0.36~rc1~dfsg/debian/rules 2012-05-13 09:13:23.000000000 +0000 @@ -46,6 +46,7 @@ DEB_CONFIGURE_FLAGS_noxpm = --without-x --without-xpm --without-fontconfig DEB_CONFIGURE_FLAGS_xpm = --with-x DEB_CONFIGURE_EXTRA_FLAGS = --disable-rpath +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_MAKESHLIBS_ARGS_libgd2-noxpm = -V'libgd2-noxpm (>= $(DEB_UPSTREAM_VERSION)) | libgd2-xpm (>= $(DEB_UPSTREAM_VERSION))' DEB_DH_MAKESHLIBS_ARGS_libgd2-xpm = -V'libgd2-xpm (>= $(DEB_UPSTREAM_VERSION))' @@ -91,23 +92,27 @@ # Strip pre-sarge X11 fallback dependencies (until fixed in d-shlibs itself) binary-post-install/libgd2-noxpm:: d-shlibmove --commit \ + --multiarch \ + --exclude-la \ --override 's/ | xlibs-dev (<< 4.3.0)//' \ --override s/libstdc++6-dev// \ --override s/libxml2-2-dev/libxml2-dev/ \ --movedev "debian/tmp-$(cdbs_curpkg)/usr/include/*" usr/include/ \ --movedev "debian/tmp-$(cdbs_curpkg)/usr/bin/gdlib-config" usr/bin/ \ --suffix -noxpm --devsuffix -noxpm \ - debian/tmp-$(cdbs_curpkg)/usr/lib/$(libname).so + debian/tmp-$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/$(libname).so binary-post-install/libgd2-xpm:: d-shlibmove --commit \ + --multiarch \ + --exclude-la \ --override 's/ | xlibs-dev (<< 4.3.0)//' \ --override s/libstdc++6-dev// \ --override s/libxml2-2-dev/libxml2-dev/ \ --movedev "debian/tmp-$(cdbs_curpkg)/usr/include/*" usr/include/ \ --movedev "debian/tmp-$(cdbs_curpkg)/usr/bin/gdlib-config" usr/bin/ \ --suffix -xpm --devsuffix -xpm \ - debian/tmp-$(cdbs_curpkg)/usr/lib/$(libname).so + debian/tmp-$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/$(libname).so # Needed by upstream for all flavors CDBS_BUILD_DEPENDS += , libpng12-dev, libz-dev, libjpeg-dev @@ -117,8 +122,3 @@ # Needed for our packaging CDBS_BUILD_DEPENDS += , d-shlibs, html2text - -common-install-arch:: - for file in debian/tmp-libgd2-xpm/usr/lib/*.la debian/tmp-libgd2-noxpm/usr/lib/*.la; do \ - sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ - done
