[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.4-54-ge9a1222



The following commit has been merged in the master branch:
commit e9a1222aa23aed03b3c35dee5f32b9ac921cf11c
Author: Jakub Wilk <jwilk@debian.org>
Date:   Wed Dec 21 19:10:22 2011 +0100

    Allow a trailing slash in the DEP-5 1.0 URL
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/source-copyright b/checks/source-copyright
index 7d8c813..450d260 100644
--- a/checks/source-copyright
+++ b/checks/source-copyright
@@ -109,7 +109,7 @@ if (m{
             $version = '0+svn';
             $uri =~ m,^\?(?:\S+[&;])?(?:pathrev|revision|rev)=(\d+)(?:[&;]\S+)?$, and $version = "$version~$1";
         }
-        elsif ($uri =~ m,^http://www\.debian\.org/doc/(?:packaging-manuals/)?copyright-format/(\d+\.\d+)$,) {
+        elsif ($uri =~ m,^http://www\.debian\.org/doc/(?:packaging-manuals/)?copyright-format/(\d+\.\d+)/?$,) {
             $version = $1;
         }
         else {
diff --git a/debian/changelog b/debian/changelog
index f3680e8..2d03f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
       (Closes: #650838)
   * checks/nmu:
     + [JW] Properly handle uploader names with commas.
+  * checks/source-copyright:
+    + [JW] Allow a trailing slash in the DEP-5 1.0 URL.
+      (Closes: #649813)
   * checks/scripts:
     + [NT] Accepted patch from Evan Broder to check for missing
       versioned pre-depends on dpkg when using maintscript helper.

-- 
Debian package checker


Reply to: