Update to standards version 4.2.1

* Update to standards version 4.2.1.
  - Enable verbose test output.
  - Install the upstream release notes as NEWS.gz, not changelog.gz.
  - Add Rules-Requires-Root: no.
  - Use https for URLs in debian/control and debian/copyright.
  - Change priority to optional.

6 files changed, 21 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index b988ea3..2666dd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 krb5-sync (3.1-2) UNRELEASED; urgency=medium
 
+  * Update to standards version 4.2.1.
+    - Enable verbose test output.
+    - Install the upstream release notes as NEWS.gz, not changelog.gz.
+    - Add Rules-Requires-Root: no.
+    - Use https for URLs in debian/control and debian/copyright.
+    - Change priority to optional.
   * Switch to the DEP-14 branch layout and update debian/gbp.conf and
     Vcs-Git accordingly.
   * Remove debian/source/local-options and local-patch-header and switch
diff --git a/debian/control b/debian/control
index 087bce4..58fee59 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
 Source: krb5-sync
 Section: net
-Priority: extra
+Priority: optional
 Maintainer: Russ Allbery <rra@debian.org>
 Build-Depends: debhelper (>= 9), dh-autoreconf, libipc-run-perl,
  libkrb5-dev, libldap2-dev, libnet-remctl-perl (>= 3.4),
  libperl6-slurp-perl, libtest-minimumversion-perl, libtest-pod-perl,
  libtest-strict-perl
-Standards-Version: 3.9.6
-Homepage: http://www.eyrie.org/~eagle/software/krb5-sync/
-Vcs-Browser: http://git.eyrie.org/?p=kerberos/krb5-sync.git
-Vcs-Git: git://git.eyrie.org/kerberos/krb5-sync.git -b debian/master
+Rules-Requires-Root: no
+Standards-Version: 4.2.1
+Homepage: https://www.eyrie.org/~eagle/software/krb5-sync/
+Vcs-Browser: https://git.eyrie.org/?p=kerberos/krb5-sync.git
+Vcs-Git: https://git.eyrie.org/git/kerberos/krb5-sync.git -b debian/master
 
 Package: krb5-sync-plugin
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 22ee72d..2ed8ee4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Russ Allbery <eagle@eyrie.org>
-Source: http://www.eyrie.org/~eagle/software/krb5-sync/
+Source: https://www.eyrie.org/~eagle/software/krb5-sync/
 Copyright: 2006-2008, 2010-2013
     The Board of Trustees of the Leland Stanford Junior University
 License: Expat
@@ -219,7 +219,7 @@ License: GPL-2+ with Autoconf exception
  Public License for more details.
  .
  You should have received a copy of the GNU General Public License along
- with this program.  If not, see <http://www.gnu.org/licenses/>.
+ with this program.  If not, see <https://www.gnu.org/licenses/>.
  .
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
@@ -264,7 +264,7 @@ License: GPL-3+ with Autoconf exception
  Public License for more details.
  .
  You should have received a copy of the GNU General Public License along
- with this program; if not, see <http://www.gnu.org/licenses/>.
+ with this program; if not, see <https://www.gnu.org/licenses/>.
  .
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
diff --git a/debian/krb5-sync-plugin.docs b/debian/krb5-sync-plugin.docs
index 724e084..5502ed8 100644
--- a/debian/krb5-sync-plugin.docs
+++ b/debian/krb5-sync-plugin.docs
@@ -1,2 +1,3 @@
+NEWS
 README
 TODO
diff --git a/debian/krb5-sync-tools.docs b/debian/krb5-sync-tools.docs
index 724e084..5502ed8 100644
--- a/debian/krb5-sync-tools.docs
+++ b/debian/krb5-sync-tools.docs
@@ -1,2 +1,3 @@
+NEWS
 README
 TODO
diff --git a/debian/rules b/debian/rules
index 6162b73..b4d6608 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 # Enable compiler hardening flags.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow,+pie
 
+# Enable verbose test output.
+export C_TAP_VERBOSE = 1
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
@@ -17,8 +20,5 @@ override_dh_auto_install:
 	rm debian/tmp/usr/lib/*/krb5/plugins/kadm5_hook/*.la
 	chmod 644 debian/tmp/usr/lib/*/krb5/plugins/kadm5_hook/*.so
 
-override_dh_installchangelogs:
-	dh_installchangelogs NEWS
-
 override_dh_builddeb:
 	dh_builddeb -- -Zxz