debian: convert from using dh_movefiles to dh_install

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

diff --git a/debian/comerr-dev.files b/debian/comerr-dev.install
similarity index 100%
rename from debian/comerr-dev.files
rename to debian/comerr-dev.install

diff --git a/debian/e2fsck-static.files b/debian/e2fsck-static.install
similarity index 100%
rename from debian/e2fsck-static.files
rename to debian/e2fsck-static.install

diff --git a/debian/e2fsprogs-l10n.files b/debian/e2fsprogs-l10n.install
similarity index 100%
rename from debian/e2fsprogs-l10n.files
rename to debian/e2fsprogs-l10n.install

diff --git a/debian/e2fsprogs-udeb.install b/debian/e2fsprogs-udeb.install
new file mode 100644 (file)
index 0000000..a6d6867
--- /dev/null
+++ b/debian/e2fsprogs-udeb.install
@@ -0,0 +1,11 @@
+etc/mke2fs.conf
+lib/*/lib*.so.*
+sbin/badblocks
+sbin/e2fsck
+sbin/mke2fs
+sbin/resize2fs
+sbin/tune2fs
+sbin/e2label
+sbin/e2mmpstatus
+sbin/fsck.ext?
+sbin/mkfs.ext?

diff --git a/debian/e2fsprogs.files b/debian/e2fsprogs.files
deleted file mode 100644 (file)
index e0e49ce..0000000
--- a/debian/e2fsprogs.files
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin
-usr/bin
-usr/lib
-usr/sbin
-usr/share/man
-etc
-lib/udev/rules.d
-lib/systemd/system
-usr/lib

diff --git a/debian/e2fsprogs.install b/debian/e2fsprogs.install
new file mode 100644 (file)
index 0000000..38064a4
--- /dev/null
+++ b/debian/e2fsprogs.install
@@ -0,0 +1,54 @@
+sbin/badblocks
+sbin/debugfs
+sbin/dumpe2fs
+sbin/e2fsck
+sbin/e2image
+sbin/e2label
+sbin/e2mmpstatus
+sbin/e2scrub
+sbin/e2scrub_all
+sbin/e2undo
+sbin/fsck.ext?
+sbin/logsave
+sbin/mke2fs
+sbin/mkfs.ext?
+sbin/resize2fs
+sbin/tune2fs
+usr/bin/chattr
+usr/bin/lsattr
+usr/lib/*/e2fsprogs/e2scrub_all_cron
+usr/lib/*/e2fsprogs/e2scrub_fail
+usr/sbin/e2freefrag
+usr/sbin/e4crypt
+usr/sbin/e4defrag
+usr/sbin/filefrag
+usr/sbin/mklost+found
+usr/share/man/man1/chattr.1
+usr/share/man/man1/lsattr.1
+usr/share/man/man5/e2fsck.conf.5
+usr/share/man/man5/ext?.5
+usr/share/man/man5/mke2fs.conf.5
+usr/share/man/man8/badblocks.8
+usr/share/man/man8/debugfs.8
+usr/share/man/man8/dumpe2fs.8
+usr/share/man/man8/e2freefrag.8
+usr/share/man/man8/e2fsck.8
+usr/share/man/man8/e2image.8
+usr/share/man/man8/e2label.8
+usr/share/man/man8/e2mmpstatus.8
+usr/share/man/man8/e2scrub.8
+usr/share/man/man8/e2scrub_all.8
+usr/share/man/man8/e2undo.8
+usr/share/man/man8/e4crypt.8
+usr/share/man/man8/e4defrag.8
+usr/share/man/man8/filefrag.8
+usr/share/man/man8/fsck.ext?.8
+usr/share/man/man8/logsave.8
+usr/share/man/man8/mke2fs.8
+usr/share/man/man8/mkfs.ext?.8
+usr/share/man/man8/mklost+found.8
+usr/share/man/man8/resize2fs.8
+usr/share/man/man8/tune2fs.8
+etc
+lib/udev/rules.d
+lib/systemd/system

diff --git a/debian/fuse2fs.files b/debian/fuse2fs.install
similarity index 100%
rename from debian/fuse2fs.files
rename to debian/fuse2fs.install

diff --git a/debian/libblkid-dev.files b/debian/libblkid-dev.install
similarity index 100%
rename from debian/libblkid-dev.files
rename to debian/libblkid-dev.install

diff --git a/debian/libblkid1.files b/debian/libblkid1.install
similarity index 100%
rename from debian/libblkid1.files
rename to debian/libblkid1.install

diff --git a/debian/libcom-err2.files b/debian/libcom-err2.install
similarity index 100%
rename from debian/libcom-err2.files
rename to debian/libcom-err2.install

diff --git a/debian/libext2fs-dev.files b/debian/libext2fs-dev.install
similarity index 100%
rename from debian/libext2fs-dev.files
rename to debian/libext2fs-dev.install

diff --git a/debian/libext2fs2.files b/debian/libext2fs2.install
similarity index 100%
rename from debian/libext2fs2.files
rename to debian/libext2fs2.install

diff --git a/debian/libss2.files b/debian/libss2.install
similarity index 100%
rename from debian/libss2.files
rename to debian/libss2.install

diff --git a/debian/libuuid1.files b/debian/libuuid1.install
similarity index 100%
rename from debian/libuuid1.files
rename to debian/libuuid1.install

diff --git a/debian/rules b/debian/rules
index 118598686056451f15eb1f5022d3f78afa576701..c232d49cc525faf878019820336198211b6c6ed8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -104,31 +104,11 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
        ${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf
 endif
 
-    # install for e2fsprogs-udeb
-       $(MAKE) -C ${stdbuilddir} V=1 install-shlibs-libs-recursive DESTDIR=${udebdir} \
-               INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
-       $(MAKE) -C ${stdbuilddir}/e2fsck V=1 install DESTDIR=${udebdir} \
-               INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
-       $(MAKE) -C ${stdbuilddir}/misc V=1 install DESTDIR=${udebdir} \
-               INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
-       $(MAKE) -C ${stdbuilddir}/resize V=1 install DESTDIR=${udebdir} \
-               INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
-
-       rm -rf ${udebdir}/usr
-       find ${udebdir}/sbin -type f -a ! -name e2fsck \
-               -a ! -name mke2fs -a ! -name tune2fs \
-               -a ! -name resize2fs -a ! -name badblocks -print | xargs rm
-
-       (cd ${udebdir}/sbin; ln -sf e2fsck fsck.ext2 ; \
-               ln -sf e2fsck fsck.ext3 ; ln -sf e2fsck fsck.ext4 ; \
-               ln -sf mke2fs mkfs.ext2 ; ln -sf mke2fs mkfs.ext3 ; \
-               ln -sf mke2fs mkfs.ext4)
-
 override_dh_install:
        dh_install -p e2fsprogs --sourcedir=${stdbuilddir} NEWS.gz \
                usr/share/doc/e2fsprogs
-       dh_movefiles
-       test -z "`find ${tmpdir} -type f`"
+       dh_install
+       dh_missing --fail-missing
 
 override_dh_lintian:
        dh_lintian
@@ -185,10 +165,8 @@ endif
        dh_shlibdeps --remaining-packages -l${stdbuilddir}/lib
 
 override_dh_gencontrol:
-       dh_gencontrol -pcomerr-dev \
-         -- -v${COMERR_VERSION}-${DEB_VERSION} -VmainBinary=${DEB_VERSION}
-       dh_gencontrol -pss-dev \
-         -- -v${SS_VERSION}-${DEB_VERSION} -VmainBinary=${DEB_VERSION}
+       dh_gencontrol -pcomerr-dev -- -v${COMERR_VERSION}-${DEB_VERSION} -VmainBinary=${DEB_VERSION}
+       dh_gencontrol -pss-dev -- -v${SS_VERSION}-${DEB_VERSION} -VmainBinary=${DEB_VERSION}
        dh_gencontrol --remaining-packages
 
 test_printenv:

diff --git a/debian/ss-dev.files b/debian/ss-dev.install
similarity index 100%
rename from debian/ss-dev.files
rename to debian/ss-dev.install

diff --git a/debian/uuid-dev.files b/debian/uuid-dev.install
similarity index 100%
rename from debian/uuid-dev.files
rename to debian/uuid-dev.install

diff --git a/debian/uuid-runtime.files b/debian/uuid-runtime.install
similarity index 100%
rename from debian/uuid-runtime.files
rename to debian/uuid-runtime.install