[libconfig-model-dpkg-perl] 01/01: dpkg copyright format: accepts http and https url and default to https (Closes: #756876)

[dod at debian.org]

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

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit dafd08a8f0c7f116c78fa73617f37251c3132b92
Author: Dominique Dumont <dod at debian.org>
Date:   Mon Sep 8 19:41:02 2014 +0200

    dpkg copyright format: accepts http and https url and default to https (Closes:  #756876)
---
 lib/Config/Model/models/Dpkg/Copyright.pl   | 8 ++++----
 t/model_tests.d/dpkg-copyright-test-conf.pl | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Config/Model/models/Dpkg/Copyright.pl b/lib/Config/Model/models/Dpkg/Copyright.pl
index 6baa11b..9dfbce0 100644
--- a/lib/Config/Model/models/Dpkg/Copyright.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright.pl
@@ -32,15 +32,15 @@ To upgrade your file from an old spec, run:
     'element' => [
       'Format',
       {
-        'default' => 'http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/',
+        'default' => 'https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/',
         'description' => 'URI of the format specification.',
         'mandatory' => '1',
-        'match' => '^http://',
+        'match' => '^https?://',
         'type' => 'leaf',
         'value_type' => 'uniline',
         'warn_unless_match' => {
-          '^http://www.debian.org/doc/packaging-manuals/copyright-format/1\\.0/?$' => {
-            'fix' => '$_ = \'http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/\';',
+          '^https?://www.debian.org/doc/packaging-manuals/copyright-format/1\\.0/?$' => {
+            'fix' => '$_ = undef;',
             'msg' => 'Format does not match the recommended URL for DEP-5'
           }
         }
diff --git a/t/model_tests.d/dpkg-copyright-test-conf.pl b/t/model_tests.d/dpkg-copyright-test-conf.pl
index d293708..cbcf234 100644
--- a/t/model_tests.d/dpkg-copyright-test-conf.pl
+++ b/t/model_tests.d/dpkg-copyright-test-conf.pl
@@ -98,7 +98,7 @@ $skip = ( $@ or not -r '/etc/debian_version') ? 1 : 0 ;
         load_check => 'skip',
         apply_fix => 1,
         check => { 
-            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:"*" Copyright' => 'Copyright 1998 John Doe <jdoe at example.com>',
             'Files:"debian/*" License short_name' => 'other',
         },
@@ -108,7 +108,7 @@ $skip = ( $@ or not -r '/etc/debian_version') ? 1 : 0 ;
         load_warnings => [ qr/Format does not match/ ],
         apply_fix => 1,
         check => { 
-            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:"*" Copyright' => "2008, John Doe <jdoe\@example.com>\n2007, Jane Smith <jsmith\@example.org>\n2007, Joe Average <joe\@example.org>\n2007, J. Random User <jr\@users.example.com>",
             },
         },
@@ -126,7 +126,7 @@ $skip = ( $@ or not -r '/etc/debian_version') ? 1 : 0 ;
         load_warnings => [ (qr/deprecated/) x 2 ],
 
         check => { 
-            Format => "http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/", 
+            Format => "https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/", 
             # something's wrong with utf8 string checks
             #'Debianized-By' => 'Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>',
             Source => 'http://tango-controls.org/download',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git