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

[SCM] Debian package checker branch, master, updated. 2.2.6-38-gf73c71b



The following commit has been merged in the master branch:
commit f73c71b9ed747f66444e36f5333646df5fc77b14
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Wed Mar 4 18:38:06 2009 +0000

    Use Lintian::Relation in checks/patch-systems

diff --git a/checks/patch-systems b/checks/patch-systems
index a5b0118..6116c13 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -22,7 +22,6 @@
 package Lintian::patch_systems;
 use strict;
 
-use Dep;
 use Tags;
 use Util;
 
@@ -38,15 +37,7 @@ sub run {
 
 	#Get build deps so we can decide which build system the maintainer
 	#meant to use:
-	my $build_deps = "";
-	if (defined $info->field('build-depends')) {
-		$build_deps = $info->field('build-depends');
-	}
-	if (defined $info->field('build-depends-indep')) {
-		$build_deps .= ", " if $build_deps;
-		$build_deps .= $info->field('build-depends-indep');
-	}
-	$build_deps = Dep::parse($build_deps);
+	my $build_deps = $info->relation('build-depends-all');
 	# Get source package format
 	my $format = "";
 	if (defined $info->field('format')) {
@@ -55,7 +46,7 @@ sub run {
 	my $quilt_format = ($format =~ /3\.\d+ \(quilt\)/) ? 1 : 0;
 
 	#----- dpatch
-	if (Dep::implies($build_deps, Dep::parse("dpatch"))) {
+	if ($build_deps->implies("dpatch")) {
 		$uses_patch_system++;
 		#check for a debian/patches file:
 		if (! -r "debfiles/patches/00list") {
@@ -117,7 +108,7 @@ sub run {
 	}
 
 	#----- quilt
-	if (Dep::implies($build_deps, Dep::parse("quilt")) or $quilt_format) {
+	if ($build_deps->implies("quilt") or $quilt_format) {
 		$uses_patch_system++;
 		#check for a debian/patches file:
 		if (! -r "debfiles/patches/series") {
diff --git a/debian/changelog b/debian/changelog
index ec0f7e6..b3d9ee3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ lintian (2.2.7) UNRELEASED; urgency=low
   * checks/nmu:
     + [RA] Calculate the regex for Ubuntu distributions only once.
     + [RA] Be robust against whitespace in the Architecture field.
+  * checks/patch-systems:
+    + [ADB] Use Lintian::Relation instead of Dep.
   * checks/rules:
     + [RA] Be robust against whitespace in the Architecture field.
     + [ADB] Remove some obsolete code and therefore stop use-ing Dep.

-- 
Debian package checker


Reply to: