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

[lintian] 02/02: Tag openjdk-6-jdk, openjdk-6-jre and openjdk-6-jre-headless as obsolete (See #720911).



This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch masterold
in repository lintian.

commit 5593d2c88f7c546c156f14341910bc3216c94400
Author: Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Date:   Tue Nov 26 16:17:28 2013 +0100

    Tag openjdk-6-jdk, openjdk-6-jre and openjdk-6-jre-headless as obsolete (See #720911).
    
    Detect when the package build dep on java-compiler.
    
    [BR] Improve wordings of checks/java.desc
    [BR] Move description to checks/fields.desc
---
 checks/fields.desc                           | 6 ++++++
 checks/fields.pm                             | 5 +++++
 data/fields/obsolete-packages                | 5 +++++
 debian/changelog                             | 5 +++++
 t/tests/fields-java/debian/debian/control.in | 2 +-
 t/tests/fields-java/tags                     | 4 ++++
 6 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/checks/fields.desc b/checks/fields.desc
index 8751018..0989add 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -587,6 +587,12 @@ Info: The package declares a build-depends on an essential package, e.g. dpkg,
  is if you need a particular version of that package, in which case the
  version should be given in the dependency.
 
+Tag: build-depends-on-an-obsolete-java-package
+Severity: normal
+Certainty: certain
+Info: The package build-depends on an obsolete java dependency.
+ It should built-depends on default-jdk instead.
+
 Tag: build-depends-on-non-build-package
 Severity: important
 Certainty: certain
diff --git a/checks/fields.pm b/checks/fields.pm
index 2d103fb..e41cccf 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -974,6 +974,11 @@ sub run {
                               $d_pkg;
                         }
 
+                        if (   $d_pkg =~ m/^java-compiler$/o){
+                            tag 'build-depends-on-an-obsolete-java-package',
+                              $d_pkg;
+                        }
+
                         if (    $d_pkg =~ m/^libdb\d+\.\d+.*-dev$/o
                             and &$is_dep_field($field)) {
                             tag 'build-depends-on-versioned-berkeley-db',
diff --git a/data/fields/obsolete-packages b/data/fields/obsolete-packages
index c70a2a0..64595de 100644
--- a/data/fields/obsolete-packages
+++ b/data/fields/obsolete-packages
@@ -80,3 +80,8 @@ automake1.7
 automake1.8
 automake1.9
 automake1.10
+
+# Deprecated in Jessie (#720911)
+openjdk-6-jdk
+openjdk-6-jre
+openjdk-6-jre-headless
diff --git a/debian/changelog b/debian/changelog
index 272c4d8..5a3090c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ lintian (2.5.20) UNRELEASED; urgency=low
       license.  (Closes: #724930)
     + [BR] Abstract sliding window algorithm and use it for
       license check.  (Closes: #720348)
+  * checks/fields.pm:
+    + [SL] Returns a warning when a package build-deps on java-compiler
+      instead of default-jdk.
   * checks/files.desc
     + [BR] Improve description of pkg-config-multi-arch-wrong-dir
       tag. Add debhelper > 9 on non multi-arched package as a likely
@@ -20,6 +23,8 @@ lintian (2.5.20) UNRELEASED; urgency=low
   * data/fields/obsolete-packages:
     + [NT] Apply patch from Eric Dorland to mark various versions
       of automake as obsolete.
+    + [SL] Tag openjdk-6-jdk, openjdk-6-jre and openjdk-6-jre-headless
+      as obsolete (See ##720911)
   * data/fields/virtual-packages:
     + [NT] Refresh against sid.  Thanks to Nicholas Breen for the
       reminder.  (Closes: #724866)
diff --git a/t/tests/fields-java/debian/debian/control.in b/t/tests/fields-java/debian/debian/control.in
index 2b8801d..5125554 100644
--- a/t/tests/fields-java/debian/debian/control.in
+++ b/t/tests/fields-java/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
 Section: java
 Maintainer: {$author}
 Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9), openjdk-6-doc
+Build-Depends: debhelper (>= 9), openjdk-6-doc, openjdk-6-jdk, java-compiler
 
 Package: lib{$source}-java
 Architecture: all
diff --git a/t/tests/fields-java/tags b/t/tests/fields-java/tags
index 7080a0f..77ba9af 100644
--- a/t/tests/fields-java/tags
+++ b/t/tests/fields-java/tags
@@ -1,4 +1,8 @@
+E: fields-java source: build-depends-on-obsolete-package build-depends: openjdk-6-jdk
 I: libfields-java-java: javalib-but-no-public-jars
+I: libfields-java-java: ored-depends-on-obsolete-package depends: openjdk-6-jre
+W: fields-java source: build-depends-on-an-obsolete-java-package java-compiler
 W: fields-java source: build-depends-on-specific-java-doc-package openjdk-6-doc
+W: fields-java source: virtual-package-depends-without-real-package-depends build-depends: java-compiler
 W: libfields-java-java-doc: depends-on-specific-java-doc-package recommends
 W: libfields-java-java: needless-dependency-on-jre

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: