Update to debhelper-compat 12

Use the versioned debhelper-compat dependency instead of debian/compat.

Add ${misc:Pre-Depends} for openafs-client and openafs-fileserver that
install init scripts.

Switch to using dh_missing instead of dh_install --fail-missing.

Since openafs uses regen.sh to wrap autoreconf, pass dh --without-autoreconf.

Adapt to separate dh_installinit and dh_installsystemd stages.

Change-Id: I7f3ca2df005c252c4e45e5c929e9da2cf39ebaf5

diff --git a/debian/changelog b/debian/changelog
index 7f920e287e791ad58d83148373aa4e289a32316b..315e99478667b0b3c1f09a6fdef5df0ae4795be3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ openafs (1.8.6~pre1-1) UNRELEASED; urgency=medium
   * Fix typo preventing ppc64el support from working (Closes: #946520)
   * Update Italian debconf translation; thanks Beatrice Torracca
     (Closes: #952799)
+  * Update to debhelper-compat 12
 
  -- Benjamin Kaduk <kaduk@mit.edu>  Sat, 21 Mar 2020 10:23:31 -0700
 

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9

diff --git a/debian/control b/debian/control
index 7c2173e8cc2a3dcd8b5435026bbf99bfa9d0663b..e08c2c24c65df6fefea83ca82aeb04d867a9e648 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
 Priority: optional
 Maintainer: Benjamin Kaduk <kaduk@mit.edu>
 Uploaders: Sam Hartman <hartmans@debian.org>, Anders Kaseorg <andersk@mit.edu>
-Build-Depends: debhelper (>= 9.20160709~), autoconf, automake, bison, comerr-dev,
- cpio, flex, libfuse-dev, libkrb5-dev, libncurses5-dev,
+Build-Depends: debhelper, debhelper-compat (= 12), autoconf, automake, bison,
+ comerr-dev, cpio, flex, libfuse-dev, libkrb5-dev, libncurses5-dev,
  libpam0g-dev, libxml2-utils, perl, pkg-config,
  libtool, heimdal-multidev (>= 1.7~git20150920)
 Build-Depends-Indep: dblatex, dkms (>= 2.1.1.1), docbook-xsl, doxygen (>= 1.8.4-1~),
@@ -17,6 +17,7 @@ Vcs-Browser: https://salsa.debian.org/debian/openafs
 Package: openafs-client
 Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
+Pre-Depends: ${misc:Pre-Depends}
 Recommends: lsof, openafs-modules-dkms (>= ${source:Version})
  | openafs-modules-source (>= ${source:Version})
  | openafs-modules3
@@ -51,6 +52,7 @@ Package: openafs-fileserver
 Architecture: alpha amd64 arm arm64 armel armhf i386 ia64 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), openafs-client,
  openafs-krb5 (>= 1.8.0~pre1-1)
+Pre-Depends: ${misc:Pre-Depends}
 Recommends: ntp | time-daemon
 Suggests: openafs-doc
 Description: AFS distributed filesystem file server

diff --git a/debian/rules b/debian/rules
index 771c2f363766898ffc3c4b588a36e7b7f5450e16..c8d68be0d59939e029080934b256c33ae6b9cc0a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ HTML_XSL   = /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
 DOC_PACKAGES = -popenafs-fuse
 
 # These are files that we know we don't want to install.  List them so that we
-# can use dh_install --fail-missing and catch anything new that shows up.
+# can use dh_missing --fail-missing and catch anything new that shows up.
 IGNORE = -XAuthLog -Xaklog_dynamic_auth.8 -Xcopyauth -Xdlog -Xdpass    \
        -Xfms.log -Xfs_chgrp.1 -Xfs_chown.1 -Xfs_cscpolicy.1            \
        -Xfs_memdump.1 -Xfs_minidump.1 -Xfs_trace.1     \
@@ -86,8 +86,9 @@ get-orig-source:
            | xz > 'openafs_$(DEBVERS).orig.tar.xz'
 
 # Use dh for most actions, with overrides below.
+# openafs provides regen.sh that supersedes autoreconf.
 %:
-       dh $@ --with-systemd
+       dh $@ --without-autoreconf
 
 # Handle the renaming of the up man page to afs-up here since the man pages
 # are generated from POD source by regen.sh.
@@ -153,7 +154,7 @@ override_dh_auto_install:
 # that scripts we install are executable
 override_dh_install-arch:
        chmod +x debian/afs-rootvol debian/afs-newcell
-       dh_install --fail-missing $(IGNORE)
+       dh_install $(IGNORE)
 
        mv debian/openafs-client/usr/bin/pagsh \
            debian/openafs-client/usr/bin/pagsh.openafs
@@ -227,10 +228,12 @@ override_dh_install-indep:
 
 # We don't want to stop the init scripts on upgrade.
 override_dh_installinit:
-       dh_systemd_enable
        dh_installinit -popenafs-client -r
        dh_installinit -popenafs-fileserver -r
 
+override_dh_installsystemd:
+       dh_installsystemd -r
+
 # Symlink /usr/share/doc for some packages.
 override_dh_installdocs:
        dh_installdocs $(DOC_PACKAGES) --link-doc=openafs-client
@@ -240,6 +243,10 @@ override_dh_installdocs:
 override_dh_installchangelogs:
        dh_installchangelogs NEWS
 
+# We want --fail-missing behavior, but --list-missing is the default
+override_dh_missing:
+       dh_missing --fail-missing $(IGNORE)
+
 # Override some of our permissions.
 override_dh_fixperms-arch:
        dh_fixperms