On Thursday 30 March 2006 01:38, Theodore Ts'o wrote: > OK, so this should do what you want.
Yes, that should do it. You could still do the debian/rules simplification if you like. The basic support for udebs was already present in the Sarge version of debhelper, only the support for the --add-udeb option was added after the release. I've attached a new patch that includes the cleanup and your solution for keeping Sarge compatibility. The debhelper dependency and compat level are left at 4. It is of course up to you if you want to apply it or not. I've checked that this does indeed produce the correct shlibs files and no other unexpected changes (except for the same weird changes in links that I also reported in the original mail, but IMHO there's no way those can result from my changes).
diff -u e2fsprogs-1.38+1.39-WIP-2005.12.31/debian/control e2fsprogs-1.38+1.39-WIP-2005.12.31/debian/control
--- e2fsprogs-1.38+1.39-WIP-2005.12.31/debian/control
+++ e2fsprogs-1.38+1.39-WIP-2005.12.31/debian/control
@@ -90,6 +90,7 @@
for more information.
Package: libuuid1-udeb
+XC-Package-Type: udeb
Section: debian-installer
Priority: optional
Depends: ${shlibs:Depends}
@@ -137,6 +138,7 @@
system instead.
Package: libblkid1-udeb
+XC-Package-Type: udeb
Section: debian-installer
Priority: optional
Depends: ${shlibs:Depends}
@@ -166,6 +168,7 @@
This package contains the development environment for the blkid library.
Package: e2fsprogs-udeb
+XC-Package-Type: udeb
Section: debian-installer
Priority: optional
Depends: ${shlibs:Depends}
only in patch2:
unchanged:
--- e2fsprogs-1.38+1.39-WIP-2005.12.31.orig/debian/rules
+++ e2fsprogs-1.38+1.39-WIP-2005.12.31/debian/rules
@@ -49,15 +49,6 @@
MANDIR=/usr/share/man
mandir=${tmpdir}${MANDIR}
-UDEB_NAME = $(package)-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
-UDEB_PRIORITY = $(shell grep '^Package: e2fsprogs-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
-
-BLKID_UDEB_NAME = libblkid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
-BLKID_UDEB_PRIORITY = $(shell grep '^Package: libblkid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
-
-UUID_UDEB_NAME = libuuid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
-UUID_UDEB_PRIORITY = $(shell grep '^Package: libuuid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
-
STAMPSDIR=debian/stampdir
CFGSTDSTAMP=${STAMPSDIR}/configure-std-stamp
CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp
@@ -316,7 +307,7 @@
$(INSTALL) -p -m 0644 debian/libblkid.copyright \
${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright
- dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
+ dh_installdocs
# HTML docs
$(INSTALL) -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
@@ -363,9 +354,15 @@
dh_compress
dh_fixperms
- dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
+ dh_makeshlibs
dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
-V 'libcomerr2 (>= 1.33-3)'
+ # These extra shlibs lines are required in order to generate correct
+ # dependencies for udebs. This is a workaround chosen to keep
+ # compatibility with debhelper in Sarge. A cleaner solution can be
+ # found in the original patch for #356293 (requires debhelper 5.0.22).
+ echo "udeb: libblkid 1 libblkid1-udeb" >> debian/libblkid1/DEBIAN/shlibs
+ echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs
dh_installdeb
dh_shlibdeps -l${stdbuilddir}/lib
@@ -374,8 +371,7 @@
dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \
-u"-Ldebian/e2fsprogs-udeb.shlibs.local"
- dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
- -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
+ dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev
DH_OPTIONS= dh_gencontrol -pcomerr-dev \
-u '-v${COMERR_VERSION}-${MAIN_VERSION}'
DH_OPTIONS= dh_gencontrol -pss-dev \
@@ -383,21 +379,8 @@
DH_OPTIONS= dh_gencontrol -puuid-dev \
-u '-v${UUID_VERSION}-${MAIN_VERSION}'
- dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
- dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
-
- # udeb stuff
- dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~
- dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY)
- dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME)
-
- dh_gencontrol -plibblkid1-udeb -- -fdebian/files~
- dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY)
- dh_builddeb -plibblkid1-udeb --filename=$(BLKID_UDEB_NAME)
-
- dh_gencontrol -plibuuid1-udeb -- -fdebian/files~
- dpkg-distaddfile $(UUID_UDEB_NAME) debian-installer $(UUID_UDEB_PRIORITY)
- dh_builddeb -plibuuid1-udeb --filename=$(UUID_UDEB_NAME)
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
pgpbPSbXApW0u.pgp
Description: PGP signature
