Fix debian problem: e2fsprogs: bogus dependency on libblkid1 due to shlibs.local

Addresses-Debian-Bug: #583551

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/debian/e2fsprogs.shlibs.local b/debian/e2fsprogs.shlibs.local.in
similarity index 73%
rename from debian/e2fsprogs.shlibs.local
rename to debian/e2fsprogs.shlibs.local.in
index 2c4334d759037dd8a8d0dc67c9fd7b4bdb6961aa..e858464ade1dd0ce91cb326b93fb85fca733a1da 100644 (file)
--- a/debian/e2fsprogs.shlibs.local
+++ b/debian/e2fsprogs.shlibs.local.in
@@ -1,6 +1,8 @@
 libcom_err 2 libcomerr2 (>= 1.34-1)
 libss 2 libss2 (>= 1.34-1)
-libuuid 1 libuuid1 (>= 1.34-1)
+ifdef(`UTIL_LINUX_NG',,
+``libuuid 1 libuuid1 (>= 1.34-1)
+libblkid 1 libblkid1 (>= 1.34-1)
+'')dnl
 libext2fs 2 e2fslibs (= ${Source-Version})
 libe2p 2 e2fslibs (= ${Source-Version})
-libblkid 1 libblkid1 (>= 1.34-1)

diff --git a/debian/rules b/debian/rules
index 1296cb97a0f135e1d417ab967a33dd85ec38a036..495c8571af000ca477f625db73dbcadf03791ddb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -167,9 +167,17 @@ else
 M4_ARGS+=-UUTIL_LINUX_NG
 endif
 
+debian-files: debian/control debian/e2fsprogs.shlibs.local
+
+mrproper: clean
+       rm debian/control debian/e2fsprogs.shlibs.local
+
 debian/control: debian/control.in debian/rules
        m4 $(M4_ARGS) < debian/control.in > $@
 
+debian/e2fsprogs.shlibs.local: debian/e2fsprogs.shlibs.local.in
+       m4 $(M4_ARGS) < debian/e2fsprogs.shlibs.local.in > $@
+
 ${CFGSTDSTAMP}:
        dh_testdir
 
@@ -599,4 +607,4 @@ endif
 
 binary: binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean checkroot mrproper debian-files