Package: expat Version: 1.95.8-3 Severity: wishlist Tags: patch, d-i Let's call this an important wishlist bug (important for Debian Installer anyway :-)
Please add the following line to your shlibs file: udeb: libexpat 1 libexpat1 (>= 1.95.8) udeb: libexpat 0 libexpat1 (>= 1.95.8) This will allow dpkg/debhelper to properly set the dependencies for udebs that depend on libexpat1. Please see #345472 and #345475 for further info on this. This will also mean that, eventually, we will be able to drop the "Provides: libexpat1" for the udeb, but we cannot do that until other udebs that currently depend on libexpat1 instead of libexpat1-udeb have been rebuilt. I'll file a separate bug when that change can be made. It would be very much appreciated if this change could be implemented soon. The attached patch implements the necessary changes: - add --add-udeb option for dh_makeshlibs which autogenerates the udeb: lines for the shlibs file - this requires debhelper 5.0.22, so updated your debian/compat - add the lines in debian/libexpat1.shlibs which currently overrules dh_makeshlibs I've also taken the liberty of reducing the complexity of your rules file. debhelper knows how to package a udeb if you include "XC-Package-Type: udeb" in the control file. I've checked the debdiff for the libexpat1 deb and udeb against current versions and there were no unexpected changes. TIA, Frans Pop
diff -u expat-1.95.8/debian/compat expat-1.95.8/debian/compat --- expat-1.95.8/debian/compat +++ expat-1.95.8/debian/compat @@ -1 +1 @@ -4 +5 diff -u expat-1.95.8/debian/control expat-1.95.8/debian/control --- expat-1.95.8/debian/control +++ expat-1.95.8/debian/control @@ -4,7 +4,7 @@ Maintainer: Debian XML/SGML Group <[EMAIL PROTECTED]> Uploaders: Ardo van Rangelrooij <[EMAIL PROTECTED]> Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1) +Build-Depends: debhelper (>= 5.0.22) Package: libexpat1-dev Section: libdevel @@ -32,6 +32,7 @@ library for parsing XML. Package: libexpat1-udeb +XC-Package-Type: udeb Section: debian-installer Priority: extra Architecture: any diff -u expat-1.95.8/debian/libexpat1.shlibs expat-1.95.8/debian/libexpat1.shlibs --- expat-1.95.8/debian/libexpat1.shlibs +++ expat-1.95.8/debian/libexpat1.shlibs @@ -2,0 +3,2 @@ +udeb: libexpat 1 libexpat1 (>= 1.95.8) +udeb: libexpat 0 libexpat1 (>= 1.95.8) diff -u expat-1.95.8/debian/rules expat-1.95.8/debian/rules --- expat-1.95.8/debian/rules +++ expat-1.95.8/debian/rules @@ -41,9 +41,6 @@ ## ---------------------------------------------------------------------- UPACKAGE = $(shell dh_listpackages | grep -- -udeb$$) -VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) -ARCH = $(shell dpkg --print-architecture) -UFILENAME = $(UPACKAGE)_$(VERSION)_$(ARCH).udeb ## ---------------------------------------------------------------------- TMP_DIR = $(CURDIR)/debian/tmp @@ -89,22 +86,19 @@ dh_testdir dh_testroot dh_install -a --sourcedir=$(TMP_DIR) - dh_installdocs -a -N$(UPACKAGE) - dh_installexamples -a -N$(UPACKAGE) - dh_installchangelogs -a Changes -N$(UPACKAGE) + dh_installdocs -a + dh_installexamples -a + dh_installchangelogs -a Changes dh_link -a dh_strip -a dh_compress -a dh_fixperms -a - dh_makeshlibs -a -V -N$(UPACKAGE) + dh_makeshlibs -a -V --add-udeb=$(UPACKAGE) dh_installdeb -a dh_shlibdeps -a -l $(PWD)/debian/libexpat1/usr/lib - dh_gencontrol -a -N$(UPACKAGE) - dh_gencontrol -p$(UPACKAGE) -- -fdebian/files~ - dpkg-distaddfile $(UFILENAME) debian-installer extra - dh_md5sums -a -N$(UPACKAGE) - dh_builddeb -a -N$(UPACKAGE) - dh_builddeb -p$(UPACKAGE) --filename=$(UFILENAME) + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a binary: binary-indep binary-arch
pgpj9kv0KIch5.pgp
Description: PGP signature
