[devscripts] 01/01: uscan: Also accept https for copyright-format URLs (Closes: #749498)

[Paul Wise]

This is an automated email from the git hooks/post-receive script.

pabs pushed a commit to branch master
in repository devscripts.

commit d3753d45967fada73771ae4f8f8079bfbcaef0ff
Author: Paul Wise <pabs at debian.org>
Date:   Tue May 27 21:05:21 2014 +0800

    uscan: Also accept https for copyright-format URLs (Closes: #749498)
---
 debian/changelog        | 3 +++
 scripts/mk-origtargz.pl | 4 ++--
 test/test_mk-origtargz  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eba4279..72d7352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ devscripts (2.14.3) UNRELEASED; urgency=medium
   [ Christoph Berg ]
   * uscan: Fix "upsteam" typo.  (Closes: #749343)
 
+  [ Paul Wise ]
+  * uscan: Also accept https for copyright-format URLs (Closes: #749498)
+
  -- Benjamin Drung <bdrung at debian.org>  Mon, 12 May 2014 22:01:14 +0200
 
 devscripts (2.14.2) unstable; urgency=medium
diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index fcf077c..5ab43c6 100755
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -264,7 +264,7 @@ unless (defined $package) {
 for my $copyright_file (@copyright_files) {
     # get files-excluded
     my $data = Dpkg::Control::Hash->new();
-    my $okformat = qr'http://www.debian.org/doc/packaging-manuals/copyright-format/[.\d]+';
+    my $okformat = qr'https?://www.debian.org/doc/packaging-manuals/copyright-format/[.\d]+';
     eval {
 	$data->load($copyright_file);
 	1;
@@ -286,7 +286,7 @@ for my $copyright_file (@copyright_files) {
 	    if ($line =~ m/\bFiles-Excluded:/i) {
 		warn "WARNING: The file $copyright_file mentions Files-Excluded, but its ".
 		     "format is not recognized. Specify Format: ".
-		     "http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ".
+		     "https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ".
 		     "in order to remove files from the tarball with mk-origtargz.\n";
 		last;
 	    }
diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz
index 4238549..9809e19 100755
--- a/test/test_mk-origtargz
+++ b/test/test_mk-origtargz
@@ -99,7 +99,7 @@ END
 
 makeDebianCopyright() {
     cat <<'END' > $TMPDIR/foo/debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Files-Excluded: exclude-this*
  .exclude-this*
  exclude-dir1
@@ -414,7 +414,7 @@ testCopyrightFormatWarning() {
 	makeDebanDir
 	makeWrongDebianCopyright
 	run_mk_origtargz foo \
-		"WARNING: The file debian/copyright mentions Files-Excluded, but its format is not recognized. Specify Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ in order to remove files from the tarball with mk-origtargz." \
+		"WARNING: The file debian/copyright mentions Files-Excluded, but its format is not recognized. Specify Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ in order to remove files from the tarball with mk-origtargz." \
 		"Successfully symlinked ../foo-0.1.tar.gz to ../foo_0.1.orig.tar.gz." \
 		 ../foo-0.1.tar.gz
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git