Debian build: remove conffile from e2fsprogs-udeb, and remove explicit conffile

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

diff --git a/debian/e2fsprogs.conffile b/debian/e2fsprogs.conffile
deleted file mode 100644 (file)
index b37917f..0000000
--- a/debian/e2fsprogs.conffile
+++ /dev/null
@@ -1 +0,0 @@
-/etc/mke2fs.conf

diff --git a/debian/rules b/debian/rules
index d97fcb13a6ef59e6cb2435108b1f9e261f75d4d0..dec23055673d1960f31fe36191d5a24d2c979403 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -372,6 +372,7 @@ endif
        echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs
 
        dh_installdeb
+       rm debian/e2fsprogs-udeb/DEBIAN/conffiles
        dh_shlibdeps -l${stdbuilddir}/lib
        dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
                -u"-Ldebian/e2fsprogs.shlibs.local"