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

[SCM] Debian package checker branch, master, updated. 2.2.13-35-g1e3df0e



The following commit has been merged in the master branch:
commit 1e3df0e5e8eb4e9f0486b7f9e2a50ffa29e7acbb
Author: Colin Watson <cjwatson@debian.org>
Date:   Sat Aug 15 00:23:06 2009 +0100

    Add build-depends check for debhelper override targets
    
    * checks/debhelper{,.desc}:
      + [CW] Check for the use of debhelper override targets, which require
        debhelper 7.0.50.

diff --git a/checks/debhelper b/checks/debhelper
index 478f016..fc6b33c 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -69,6 +69,7 @@ my $seendhpython = '';
 my $usescdbspython = '';
 my $seendhcleank = '';
 my $needmiscdepends = 0;
+my $overridetargets = 0;
 my %missingbdeps;
 
 open(RULES, '<', "debfiles/rules") or fail("cannot read debian/rules: $!");
@@ -142,6 +143,9 @@ while (<RULES>) {
 	$dhcompatvalue = $1;
 	# one can export and then set the value:
 	$level = $1 if ($level);
+    } elsif (/^override_dh_/) {
+	$needbuilddepends = 1;
+	$overridetargets = 1;
     }
     if (/^\s+dh_python\s/) {
         $seendhpython = 1;
@@ -263,7 +267,7 @@ while (defined(my $file=readdir(DEBIAN))) {
 	my $needed = "debhelper (>= $level)";
 	if (not $bdepends->implies($needed)) {
 	    tag "package-lacks-versioned-build-depends-on-debhelper", $level;
-	} elsif (@versioncheck) {
+	} elsif (@versioncheck or $overridetargets) {
 	    my %seen;
 	    @versioncheck = grep { !$seen{$_}++ } @versioncheck;
 	    for my $program (@versioncheck) {
@@ -274,6 +278,14 @@ while (defined(my $file=readdir(DEBIAN))) {
 			$program, "(>= $required)";
 		}
 	    }
+	    if ($overridetargets) {
+		my $required = '7.0.50~';
+		my $needed = "debhelper (>= $required)";
+		unless ($bdepends->implies($needed)) {
+		    tag 'debhelper-overrides-need-versioned-build-depends',
+			"(>= $required)";
+		}
+	    }
 	}
     } elsif ($file =~ m/^ex\.|\.ex$/i) {
         tag "dh-make-template-in-source", "debian/$file";
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 806c39e..c8b0c55 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -161,6 +161,20 @@ Info: The given debhelper script was introduced in a later version of
  assumes a newer version should explicitly declare so for the sake of
  etch backports.
 
+Tag: debhelper-overrides-need-versioned-build-depends
+Severity: normal
+Certainty: certain
+Info: The override targets facility in debhelper, involving debian/rules
+ targets that begin with "override_dh_", was introduced in a later version
+ of debhelper than the package Build-Depends on.  The package Build-Depends
+ should be updated to require at least debhelper 7.0.50.  Giving the version
+ followed by <tt>~</tt> is recommended so that backports will satisfy the
+ dependency.
+ .
+ lenny was released with debhelper version 7.0.15, so every package that
+ assumes a newer version should explicitly declare so for the sake of lenny
+ backports.
+
 Tag: brace-expansion-in-debhelper-config-file
 Severity: normal
 Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index 7a1660b..4104436 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,16 @@ lintian (2.2.14) UNRELEASED; urgency=low
 
   * Summary of tag changes:
     + Added:
+      - debhelper-overrides-need-versioned-build-depends
       - patch-system-but-no-source-readme
       - possible-documentation-but-no-doc-base-registration
 
   * checks/debconf:
     + [CW] Permit Help: in .templates files, which is supported as of
       cdebconf 0.143 and used in the installer.
+  * checks/debhelper{,.desc}:
+    + [CW] Check for the use of debhelper override targets, which require
+      debhelper 7.0.50.
   * checks/description:
     + [RA] Decode descriptions from UTF-8 before checking length.  Thanks,
       Charles Plessy.  (Closes: #537207)

-- 
Debian package checker


Reply to: