virtual-package-names-list.txt: update java-runtime list

Added java{5,6,7,8,9}-runtime{,-headless}
Removed java1-runtime, java2-runtime

Wording: Emmanuel Bourg <ebourg@apache.org>
Seconded: Tony Mancill <tmancill@debian.org>
Seconded: Bill Allombert <ballombe@debian.org>
Closes: #754876

diff --git a/debian/changelog b/debian/changelog
index 0bab2bb2dc21a73fb42289467206f5b75f26bc7b..4f044e74cbb06d44ad527d449e17191e0d65ca58 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ debian-policy (3.9.6.0) unstable; urgency=low
   * debian/control:
     - Build-Depends emacs24-nox|emacs24 instead of emacs23. Closes: #753999
     Thanks Gabriele Giacone.
+  * Packaging: refreshed the names of the Policy Editors.
   * Policy: [11.5.1] Web servers: Fix use of metasyntactic variables and
     applications Closes: #737730. Thanks Olivier Berger.
   * Policy: [5.6.21] Files: Fix typo "by" -> be. Closes: #753353.
@@ -54,8 +55,11 @@ debian-policy (3.9.6.0) unstable; urgency=low
     Seconded: Bill Allombert <ballombe@debian.org>
     Seconded: Jonathan Nieder <jrnieder@gmail.com>
     Closes: #555980
-  * Packaging: refreshed the names of the Policy Editors.
-
+  * virtual-package-names-list: Update java runtime list
+    Wording: Emmanuel Bourg <ebourg@apache.org>
+    Seconded: Tony Mancill <tmancill@debian.org>
+    Seconded: Bill Allombert <ballombe@debian.org>
+    Closes: #754876
   [ Jonathan Nieder ]
   * Policy: Drop FHS requirement that /usr/local/lib<qual> exist when /lib<qual>
     or /usr/lib<qual> does.

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 328d15b3213a7282244183f8a7e4c29230fa3791..4d7360dbb8923791a3a784d0ab9bdfd5a0b614f5 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -59,6 +59,11 @@ Released xxx, 2014.
   <item> Binaries must not be statically linked with the GNU C library,
   see policy for exceptions.
   </item>
+<tag>virtual</tag>
+  <item><tt>java1-runtime</tt> and <tt>java2-runtime</tt> are removed,
+  <tt>javaN-runtime</tt> and <tt>javaN-runtime-headless</tt> are added
+  for all N between 5 and 9.
+  </item>
 <tag>perl</tag>
   <item> Perl packages should use the <tt>%Config</tt> hash to locate module
          paths instead of hardcoding paths in <tt>@INC</tt>.
@@ -68,6 +73,7 @@ Released xxx, 2014.
          <tt>$Config{vendorarch}</tt> must depend on the relevant
          <package>perlapi-*</package> package.
   </item> </taglist></p>
+
 <sect id="3.9.5.0"> Version 3.9.5.0
 <p>
 

diff --git a/virtual-package-names-list.txt b/virtual-package-names-list.txt
index 2c2a175690ec2d9b0615da8d56c259a4f459acfc..ac982611299bf2cf9da57a06068f8a83c16e6de0 100644 (file)
--- a/virtual-package-names-list.txt
+++ b/virtual-package-names-list.txt
@@ -161,8 +161,16 @@ Graphics and MultiMedia
 
 Java and virtual machines
 -------------------------
- java1-runtime           a Java runtime environment, Java version 1
- java2-runtime           a Java runtime environment, Java version 2
+ java5-runtime           a Java runtime environment, Java version 5
+ java6-runtime           a Java runtime environment, Java version 6
+ java7-runtime           a Java runtime environment, Java version 7
+ java8-runtime           a Java runtime environment, Java version 8
+ java9-runtime           a Java runtime environment, Java version 9
+ java5-runtime-headless  a non-graphical Java runtime environment, Java ver. 5
+ java6-runtime-headless  a non-graphical Java runtime environment, Java ver. 6
+ java7-runtime-headless  a non-graphical Java runtime environment, Java ver. 7
+ java8-runtime-headless  a non-graphical Java runtime environment, Java ver. 8
+ java9-runtime-headless  a non-graphical Java runtime environment, Java ver. 9
 
 Scheme and interpreters
 -------------------------
@@ -329,3 +337,7 @@ Bill Allombert:
 Charles Plessy:
   03 Aug 2013 Removed mp3-encoder
   17 Aug 2013 Removed mp3-decoder
+
+Bill Allombert:
+  16 Jul 2014 Added java{5,6,7,8,9}-runtime{,-headless}
+              Removed java1-runtime, java2-runtime