[lintian] 02/02: c/fields.pm: Add foo-jdk-headless to @known_java_pkg
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit c506965fe194d5d5883a433426ddc509a4ca4c1a
Author: Niels Thykier <niels@thykier.net>
Date: Sun Apr 3 18:51:03 2016 +0000
c/fields.pm: Add foo-jdk-headless to @known_java_pkg
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/fields.pm | 10 +++++-----
debian/changelog | 4 ++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/checks/fields.pm b/checks/fields.pm
index 45c6a27..a28860d 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -81,11 +81,11 @@ our %known_tkxs = map { $_ => 1 } ('tkx8.2', 'tkx8.3',);
our %known_libpngs = map { $_ => 1 } ('libpng12-0', 'libpng2', 'libpng3',);
our @known_java_pkg = map { qr/$_/ } (
- 'default-jre(?:-headless)?', 'default-jdk', # default java
- 'java\d*-runtime(?:-headless)?'
- , # java-runtime and javaX-runtime alternatives (virtual)
- '(openjdk-|sun-java)\d+-jre(?:-headless)?',
- '(openjdk-|sun-java)\d+-jdk', # openjdk-X and sun-javaX
+ 'default-j(?:re|dk)(?:-headless)?',
+ # java-runtime and javaX-runtime alternatives (virtual)
+ 'java\d*-runtime(?:-headless)?',
+ # openjdk-X and sun-javaX
+ '(openjdk-|sun-java)\d+-j(?:re|dk)(?:-headless)?',
'gcj-(?:\d+\.\d+-)?jre(?:-headless)?', 'gcj-(?:\d+\.\d+-)?jdk', # gcj
'gij',
'java-gcj-compat(?:-dev|-headless)?', # deprecated/transitional packages
diff --git a/debian/changelog b/debian/changelog
index 0d1f6fb..cb683b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ lintian (2.5.44) UNRELEASED; urgency=medium
XXX: generate tag summary with private/generate-tag-summary
+ * checks/fields.pm:
+ + [NT] Add default-jdk-headless and openjdk-X-jdk-headless
+ to the set of known java providers.
+
-- Niels Thykier <niels@thykier.net> Sun, 03 Apr 2016 18:48:59 +0000
lintian (2.5.43) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: