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 2c4334d7..e858464a 100644 --- 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 1296cb97..495c8571 100755 --- 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