Package: libgd2
Version: 2.0.36~rc1~dfsg-6
Severity: normal
Tags: patch
Hi!
The attached patch provides the changes needed to build with Multi-Arch
support, and removes the shipped .la files completely. Both are in support
of their respective release goals.
Thanks,
-Kees
--
Kees Cook @debian.org
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 13:23:44.000000000
-0700
+++ libgd2-2.0.36~rc1~dfsg/debian/changelog 2011-12-17 11:06:27.000000000
-0800
@@ -1,3 +1,10 @@
+libgd2 (2.0.36~rc1~dfsg-7) UNRELEASED; urgency=low
+
+ * debian/{control*,rules}: Added Multi-Arch support.
+ * debian/rules: Drop .la file completely; not used by anything.
+
+ -- Kees Cook <k...@debian.org> Sat, 17 Dec 2011 09:12:18 -0800
+
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 13:20:10.000000000
-0700
+++ libgd2-2.0.36~rc1~dfsg/debian/control 2011-12-17 11:08:12.000000000
-0800
@@ -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 13:20:10.000000000
-0700
+++ libgd2-2.0.36~rc1~dfsg/debian/control.in 2011-12-17 09:25:18.000000000
-0800
@@ -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 13:20:10.000000000 -0700
+++ libgd2-2.0.36~rc1~dfsg/debian/rules 2011-12-17 11:11:32.000000000 -0800
@@ -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
