Whamcloud - gitweb
debian: fix FTBFS regression caused by debhelper/10.9
authorTheodore Ts'o <tytso@mit.edu>
Mon, 16 Oct 2017 04:38:00 +0000 (00:38 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 16 Oct 2017 04:38:00 +0000 (00:38 -0400)
The problem is caused by obsolete packages referenced in the rules
file.  The latest version of debhelper is no longer forgiving about
non-existing packages being referenced in debhelper commands.

Addresses-Debian-Bug: #876551
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
debian/rules

index 94fe706..841715d 100755 (executable)
@@ -395,7 +395,7 @@ binary-arch: install $(INSTALL_UDEB)
        mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc
        ln -sf e2fslibs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev
 
-       dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
+       dh_installdocs -Ne2fsprogs-udeb
 
   # HTML docs
        $(INSTALL) -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
@@ -461,8 +461,7 @@ ifeq ($(SKIP_FUSE2FS),)
                -u"-Ldebian/e2fsprogs.shlibs.local"
 endif
 
-       dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
-               -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
+       dh_gencontrol -Ncomerr-dev -Nss-dev -Ne2fsprogs-udeb
        DH_OPTIONS= dh_gencontrol -pcomerr-dev \
          -u '-v${COMERR_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}'
        DH_OPTIONS= dh_gencontrol -pss-dev \