Release as 4.9.1 and upload to Debian unstable as 4.9.1-1

No other changes were needed.

.travis.yml

@@ -12,7 +12,6 @@ perl:
   - "5.14"
   - "5.12"
   - "5.10"
-  - "dev"
   - "blead"
 
 matrix:

Makefile

@@ -14,7 +14,7 @@
 #
 TMPDIR     ?= /tmp
 DIST_PREFIX = ${TMPDIR}
-VERSION     = 4.9
+VERSION     = 4.9.1
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -270,6 +270,7 @@ manpages:
 #
 release: orig-tar-gz
 	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
+	cp -p ../$(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
 	git tag -s -m "Release as $(VERSION)" "release-$(VERSION)"
 
 tarball: test tidy fixup-perms update-version update-modules clean changelog

bin/xen-create-image

@@ -872,7 +872,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 #

bin/xen-create-nfs

@@ -121,7 +121,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 # store version number away.

bin/xen-delete-image

@@ -167,7 +167,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 #

bin/xen-list-images

@@ -106,7 +106,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 

bin/xen-resize-guest

@@ -111,7 +111,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 #

bin/xen-update-image

@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 #

bin/xt-create-xen-config

@@ -148,7 +148,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 

bin/xt-customize-image

@@ -100,7 +100,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 

bin/xt-guess-suite-and-mirror

@@ -79,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 # Init
 my $mirror = '';

bin/xt-install-image

@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.9.1';
 
 
 #

debian/changelog

@@ -1,3 +1,14 @@
+xen-tools (4.9.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+    + Fix missing "|" in regex in Debian's 20-setup-apt. (Closes: #997668)
+    + Make test xt/gitignore.t work with git releases ≥ 2.32.0.
+    + Travis CI: stop testing again Perl "dev". It no more seems to exist.
+    + Also create an .orig.tar.xz signature upon "make release".
+  * Declare compliance with Debian Policy 4.6.0. (No changes needed.)
+
+ -- Axel Beckert <abe@debian.org>  Sun, 24 Oct 2021 05:38:40 +0200
+
 xen-tools (4.9-1) unstable; urgency=medium
 
   * New upstream bugfix and minor feature release.

debian/control

@@ -18,7 +18,7 @@ Build-Depends: debhelper-compat (= 13),
                libtest-pod-coverage-perl,
                libtest-pod-perl,
                libtext-template-perl
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Homepage: https://xen-tools.org/software/xen-tools
 Vcs-Browser: https://github.com/xen-tools/xen-tools
 Vcs-Git: https://github.com/xen-tools/xen-tools.git

hooks/debian/20-setup-apt

@@ -66,7 +66,7 @@ if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
      test -e /etc/apt/sources.list && \
      grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
 
-    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then
+    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster)\b'; then
 
         cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
 #

xt/gitignore.t

@@ -23,7 +23,7 @@ if (which('git') and -d '.git') {
 use_ok( 'Git' );
 
 # First, check that no tracked files are ignored
-my $cmd = Git::command_output_pipe('ls-files', '--ignored', '--exclude-standard');
+my $cmd = Git::command_output_pipe('ls-files', '--cached', '--ignored', '--exclude-standard');
 my $output;
 while (<$cmd>) { $output .= "--> $_" }
 close $cmd;