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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc3-12-ga32a222



The following commit has been merged in the master branch:
commit b3159e8f142778844d8e5a6999801d1fe7477633
Author: Iain Lane <laney@ubuntu.com>
Date:   Mon Jul 26 22:43:28 2010 +0100

    Add check for direct changes in 3.0 (quilt) packages
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/patch-systems b/checks/patch-systems
index 082ad22..515561c 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -173,6 +173,14 @@ sub run {
 				}
 			}
 		}
+		if ($quilt_format) { # 3.0 (quilt) specific checks
+		    # Format 3.0 packages may generate a debian-changes-$version patch
+		    my $version = $info->field('version');
+		    if (-f "debfiles/patches/debian-changes-$version" &&
+			! -f 'debfiles/debian/source/patch-header') {
+			tag 'format-3.0-but-debian-changes-patch';
+		    }
+		}
 	} else {
 		if (-r "debfiles/patches/series" and
 		    -f "debfiles/patches/series") {
diff --git a/checks/patch-systems.desc b/checks/patch-systems.desc
index d3723c0..b709e15 100644
--- a/checks/patch-systems.desc
+++ b/checks/patch-systems.desc
@@ -123,6 +123,19 @@ Info: The package uses a patch system, but the Debian diff.gz contains
  possible future source package formats if all changes outside the
  <tt>debian</tt> directory are stored as patches.
 
+Tag: format-3.0-but-debian-changes-patch
+Severity: minor
+Certainty: certain
+Info: This package declares source format 3.0 (quilt), but the Debian
+ .debian.tar.gz file contains a debian-changes-VERSION patch, which represents
+ direct changes to files outside of the <tt>debian</tt> directory. This often
+ indicates accidental changes that weren't meant to be in the package or changes
+ that were supposed to be separated out into a patch.
+ .
+ If this is intentional, you may wish to consider adding
+ <tt>single-debian-patch</tt> to <tt>debian/source/options</tt>, and/or a patch
+ header to <tt>debian/source/patch-header</tt> explaining why this is done.
+
 Tag: more-than-one-patch-system
 Severity: minor
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 8a2ce92..6b5ebe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 lintian (2.5.0~rc4) UNRELEASED; urgency=low
 
+  * Summary of tag changes:
+    + Added:
+      - format-3.0-but-debian-changes-patch
+
   * checks/copyright-file.desc:
     + [ADB] Correct a spelling mistake ("coypright" -> "copyright") in the
       description of copyright-refers-to-deprecated-bsd-license-file; thanks,
       Kees Cook.  (Closes: #623780)
+  * checks/patch-systems{,.desc}:
+    + [NT] Detect when 3.0 (quilt) packages have a debian-changes-VERSION
+      patch without a patch header.  Thanks to Iain Lane for suggestion
+      and patch.  (Closes: #588873)
 
  -- Adam D. Barratt <adam@adam-barratt.org.uk>  Sat, 23 Apr 2011 13:37:52 +0100
 

-- 
Debian package checker


Reply to: