Applied NMU patch to fix Debian bugs #203056 and #203058

diff --git a/debian/changelog b/debian/changelog
index 6d5ecbb..048bcd7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+e2fsprogs (1.34-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * don't call ldconfig in udebs.
+  * fix dependencies of e2fsprogs-udeb.
+
+ -- Bastian Blank <waldi@debian.org>  Tue, 29 Jul 2003 12:11:54 +0200
+
 e2fsprogs (1.34-1) unstable; urgency=low
 
   * New upstream version.

diff --git a/debian/e2fsprogs-udeb.shlibs.local b/debian/e2fsprogs-udeb.shlibs.local
new file mode 100644 (file)
index 0000000..2c6e6fa
--- /dev/null
+++ b/debian/e2fsprogs-udeb.shlibs.local
@@ -0,0 +1,6 @@
+libblkid 1 libblkid1-udeb
+# force the dependency to libblkid1-udeb, even if it don't include the lib
+libcom_err 2 libblkid1-udeb
+libuuid 1 libblkid1-udeb
+libext2fs 2 libblkid1-udeb
+libe2p 2 libblkid1-udeb

diff --git a/debian/rules b/debian/rules
index 45c6167..b308152 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -329,7 +329,7 @@ binary-arch: install install-udeb
        dh_compress
        dh_fixperms
 
-       dh_makeshlibs
+       dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb
        dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
                -V 'libcomerr2 (>= 1.33-3)'
 
@@ -337,6 +337,8 @@ binary-arch: install install-udeb
        dh_shlibdeps -l${stdbuilddir}/lib
        dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
                -u"-Ldebian/e2fsprogs.shlibs.local"
+       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