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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-129-g094f0bd



The following commit has been merged in the master branch:
commit 094f0bdda8fc051b6847af3d9a1fa004d30d2c25
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Apr 14 21:25:27 2011 +0200

    emit needless-dependency-on-jre only once and never for -gcj pkgs

diff --git a/checks/fields b/checks/fields
index d900fcb..ea77f61 100644
--- a/checks/fields
+++ b/checks/fields
@@ -542,7 +542,8 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
 	my (%fields, %parsed);
 	my $javalib = 0;
 	my $replaces = Lintian::Relation->new($info->field('replaces')//'');
-	$javalib = 1 if($pkg =~ m/^lib.*-(?:java|gcj)$/o);
+	my %nag_once = ();
+	$javalib = 1 if($pkg =~ m/^lib.*-java$/o);
 	for my $field (qw(depends pre-depends recommends suggests conflicts provides enhances replaces breaks)) {
 		next unless defined $info->field($field);
 		#Get data and clean it
@@ -692,8 +693,11 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
 
 			# Only emit the tag if all the alternatives are JVM/JRE/JDKs
 			# - assume that <some-lib> | openjdk-6-jre-headless makes sense for now.
-			tag 'needless-dependency-on-jre'
-			    if (scalar(@alternatives) == $javadep);
+			if (scalar(@alternatives) == $javadep
+			    && !exists $nag_once{'needless-dependency-on-jre'}){
+			    $nag_once{'needless-dependency-on-jre'} = 1;
+			    tag 'needless-dependency-on-jre'
+			}
 		}
 		tag 'package-depends-on-multiple-libstdc-versions', @seen_libstdcs
 		    if (scalar @seen_libstdcs > 1);
diff --git a/debian/changelog b/debian/changelog
index 47e8db7..50b6a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,11 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
     + [NT] Use new alt-dh_commands data file to fetch alternative
       dependencies for dh_commands, which are sometimes provided
       indirectly by meta or API packages.
+  * checks/fields:
+    + [NT] Do not emit needless-dependency-on-jre for libX-gcj
+      packages and only emit the tag at most once per package.
+      Thanks to Rene Engelhard for the report.
+      (Closes: #622396)
   * checks/files{,.desc}:
     + [NT] Added dir-or-file-in-run tag.
   * checks/manpages:

-- 
Debian package checker


Reply to: