Package: imlib2
Version: 1.4.2-8
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

Hi Laurence,

The attached patch has just been applied to the Ubuntu imlib2 package, to
null out the dependency_libs field in the libtool .la file being shipped in
the -dev package.  This is generally a good idea because it avoids causing
consumers of your library to require other .la files listed here to be
available at build time when they're not actually needed (i.e., in the
dynamic linking common case).  It's specifically a good idea right now
because multiarch is imminent, and that means the .la files referenced here
are going to *move* soon, causing build failures for anything using libtool
to build against imlib2.  As long as imlib2 is going to need a rebuild to
fix up the invalid .la references, it would be nice to get rid of them
altogether.

The patch also makes some changes to debian/rules to update it for the
current recommended use of dh(1); normally I wouldn't make such changes to a
package in an Ubuntu upload, but the --until, --remaining usage was
sufficiently suspect (making assumptions about the dh sequence, the exact
reason that dh(1) doesn't recommend doing things this way anymore), that I
thought it was called for in this case.

The changelog entry for this upload is:

  * redo debian/rules to use override_dh_* rules, and build-depend on
    debhelper 7.0.50.
  * debian/rules: clean the dependency_libs out of .la files at build
    time, per Policy 10.2
  * add missing blank line to debian/control, without which this is not a
    valid control file.

Thanks,
--
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
=== modified file 'debian/control'
--- debian/control      2010-02-14 05:29:48 +0000
+++ debian/control      2011-03-26 03:12:52 +0000
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Laurence J. Lane <ljl...@debian.org>
-Build-Depends: libjpeg-dev, libtiff-dev, libpng12-dev, zlib1g-dev, libgif-dev, 
libx11-dev, libxext-dev, libfreetype6-dev, libltdl3-dev, libbz2-dev, 
libid3tag0-dev, debhelper (>> 7), autoconf, automake, libtool, cvs
+Build-Depends: libjpeg-dev, libtiff-dev, libpng12-dev, zlib1g-dev, libgif-dev, 
libx11-dev, libxext-dev, libfreetype6-dev, libltdl3-dev, libbz2-dev, 
libid3tag0-dev, debhelper (>> 7.0.50), autoconf, automake, libtool, cvs
 Standards-Version: 3.8.4
 
 Package: libimlib2
@@ -17,7 +18,7 @@
  filters, scripting, and more.
  .
  Imlib2 is not a drop-in replacement for Imlib 1.x.
- 
+
 Package: libimlib2-dev
 Architecture: any
 Section: libdevel

=== modified file 'debian/rules'
--- debian/rules        2010-02-13 19:47:18 +0000
+++ debian/rules        2011-03-26 03:13:09 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-configure := --enable-mmx=no --prefix=/usr --exec-prefix=/usr --disable-amd64
+configure := --enable-mmx=no --disable-amd64
 
 %:
        dh $@
@@ -13,20 +13,20 @@
 
 else
 
-build: debian/stamp-build
-debian/stamp-build:
-       dh build --before dh_auto_configure
+override_dh_auto_configure:
        autoreconf -fi
        dh_auto_configure -- $(configure)
-       dh build --after dh_auto_configure
-       touch $@
 
-install: build debian/stamp-install
-debian/stamp-install:
-       dh install --until dh_prep
+override_dh_installdocs:
        dh_installdocs AUTHORS README TODO
+
+override_dh_installchangelogs:
        dh_installchangelogs ChangeLog
-       dh install --remaining
-       touch $@
+
+override_dh_auto_install:
+       dh_auto_install
+       for file in debian/tmp/usr/lib/*.la; do \
+               sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
+       done
 
 endif

Reply via email to