[SCM] Debian package checker branch, master, updated. 2.2.0-46-ge210ecf
The following commit has been merged in the master branch:
commit b8fc95c8e98aed831470ca35ba232a1327e0287b
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sat Jan 31 18:57:48 2009 -0600
Reorganize checks/debhelper code
Reorganise the code so that all the compat-related stuff is together.
Signed-off-by: Raphael Geissert <atomo64@gmail.com>
diff --git a/checks/debhelper b/checks/debhelper
index f761c30..963cbcd 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -198,6 +198,29 @@ if ($needversiondepends !~ m/^\d+$/ and not $compatnan) {
$compatnan = 1;
}
+if ($usescdbs and not $needversiondepends) {
+ $needversiondepends = $cdbscompat;
+}
+$needversiondepends ||= 1;
+if ($needversiondepends < 4) {
+ tag "package-uses-deprecated-debhelper-compat-version", $needversiondepends;
+} elsif ($needversiondepends > 5 and ! Dep::implies($bdepends, Dep::parse("debhelper (>= $needversiondepends)"))) {
+ tag "package-lacks-versioned-build-depends-on-debhelper", $needversiondepends;
+} elsif (@versioncheck) {
+ my %seen;
+ @versioncheck = grep { !$seen{$_}++ } @versioncheck;
+ for my $program (@versioncheck) {
+ my $required = $versions{$program};
+ tag 'debhelper-script-needs-versioned-build-depends', $program, "(>= $required)"
+ unless Dep::implies($bdepends, Dep::parse("debhelper (>= $required)"));
+ }
+}
+
+if ($seendhcleank and $compat >= 7) {
+ tag "dh-clean-k-is-deprecated";
+}
+
+
# Check the files in the debian directory for various debhelper-related
# things.
my $bdepends;
@@ -289,28 +312,6 @@ if ($seendhpython && !$usescdbspython) {
}
}
-if ($usescdbs and not $needversiondepends) {
- $needversiondepends = $cdbscompat;
-}
-$needversiondepends ||= 1;
-if ($needversiondepends < 4) {
- tag "package-uses-deprecated-debhelper-compat-version", $needversiondepends;
-} elsif ($needversiondepends > 5 and ! Dep::implies($bdepends, Dep::parse("debhelper (>= $needversiondepends)"))) {
- tag "package-lacks-versioned-build-depends-on-debhelper", $needversiondepends;
-} elsif (@versioncheck) {
- my %seen;
- @versioncheck = grep { !$seen{$_}++ } @versioncheck;
- for my $program (@versioncheck) {
- my $required = $versions{$program};
- tag 'debhelper-script-needs-versioned-build-depends', $program, "(>= $required)"
- unless Dep::implies($bdepends, Dep::parse("debhelper (>= $required)"));
- }
-}
-
-if ($seendhcleank and $compat >= 7) {
- tag "dh-clean-k-is-deprecated";
-}
-
}
1;
--
Debian package checker
Reply to: