tags 698108 + patch
thanks

Dear maintainer,

I've prepared an NMU for java-package (versioned as 0.50+nmu2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer (or even if I should dcut it to 0-day, given the
security matter).

If you prefer to fix it in another not intrusive way (not c1fb4d0), I'm
happy to (quickly) sponsor your package too.

Regards.

David
diff -Nru java-package-0.50+nmu1/debian/changelog java-package-0.50+nmu2/debian/changelog
--- java-package-0.50+nmu1/debian/changelog	2012-09-06 18:38:09.000000000 -0400
+++ java-package-0.50+nmu2/debian/changelog	2013-01-14 19:31:25.000000000 -0400
@@ -1,3 +1,11 @@
+java-package (0.50+nmu2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Java 7 updates now get two digits. Closes: #698108
+  * Update documentation accordingly.
+
+ -- David Prévot <taf...@debian.org>  Mon, 14 Jan 2013 19:30:55 -0400
+
 java-package (0.50+nmu1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru java-package-0.50+nmu1/debian/control java-package-0.50+nmu2/debian/control
--- java-package-0.50+nmu1/debian/control	2012-09-06 18:38:27.000000000 -0400
+++ java-package-0.50+nmu2/debian/control	2013-01-14 19:40:26.000000000 -0400
@@ -19,10 +19,10 @@
  (with archive files downloaded from providers listed below)
  .
  Supported java binary distributions currently include:
-   * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
-     - The J2SE Development Kit (JDK), version 6 (update >= 10), 7
-     - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7
-     - The J2SE API Javadoc, version 6 (update >= 10), 7
+   * Oracle (http://www.oracle.com/technetwork/java/javase/downloads):
+     - The J2SE Development Kit (JDK), version 6 and 7 (update >= 10)
+     - The J2SE Runtime Environment (JRE), version 6 and 7 (update >= 10)
+     - The J2SE API Javadoc, version 6 and 7 (update >= 10)
  (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
  .
  Please note that Debian recommends the use of openjdk-6-jdk/openjdk-6-jre
diff -Nru java-package-0.50+nmu1/debian/README.Debian java-package-0.50+nmu2/debian/README.Debian
--- java-package-0.50+nmu1/debian/README.Debian	2012-02-08 19:52:45.000000000 -0400
+++ java-package-0.50+nmu2/debian/README.Debian	2013-01-14 19:40:33.000000000 -0400
@@ -15,10 +15,10 @@
 - installing the generated package
 
 Supported java binary distributions currently include:
-  * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
-    - The J2SE Development Kit (JDK), version 6 (update >= 10), 7
-    - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7
-    - The J2SE API Javadoc, version 6 (update >= 10), 7
+  * Oracle (http://www.oracle.com/technetwork/java/javase/downloads):
+    - The J2SE Development Kit (JDK), version 6 and 7 (update >= 10)
+    - The J2SE Runtime Environment (JRE), version 6 and 7 (update >= 10)
+    - The J2SE API Javadoc, version 6 and 7 (update >= 10)
   (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
 
 All other previously supported jvm (Blackdown, IBM, ..) have been removed and
diff -Nru java-package-0.50+nmu1/lib/oracle-j2re.sh java-package-0.50+nmu2/lib/oracle-j2re.sh
--- java-package-0.50+nmu1/lib/oracle-j2re.sh	2012-01-21 08:21:00.000000000 -0400
+++ java-package-0.50+nmu2/lib/oracle-j2re.sh	2013-01-14 19:10:30.000000000 -0400
@@ -12,8 +12,8 @@
 	    j2se_priority=314
 	    found=true
 	    ;;
-	"jre-7u"[0-9]"-linux-i586.tar.gz") # SUPPORTED
-	    j2se_version=1.7.0+update${archive_name:6:1}${revision}
+	"jre-7u"[0-9][0-9]"-linux-i586.tar.gz") # SUPPORTED
+	    j2se_version=1.7.0+update${archive_name:6:2}${revision}
 	    j2se_expected_min_size=94 #Mb
 	    j2se_priority=316
 	    found=true
@@ -28,8 +28,8 @@
 	    j2se_priority=314
 	    found=true
 	    ;;
-	"jre-7u"[0-9]"-linux-x64.tar.gz") # SUPPORTED
-	    j2se_version=1.7.0+update${archive_name:6:1}${revision}
+	"jre-7u"[0-9][0-9]"-linux-x64.tar.gz") # SUPPORTED
+	    j2se_version=1.7.0+update${archive_name:6:2}${revision}
 	    j2se_expected_min_size=88 #Mb
 	    j2se_priority=316
 	    found=true
diff -Nru java-package-0.50+nmu1/lib/oracle-j2sdk-doc.sh java-package-0.50+nmu2/lib/oracle-j2sdk-doc.sh
--- java-package-0.50+nmu1/lib/oracle-j2sdk-doc.sh	2012-01-21 08:21:00.000000000 -0400
+++ java-package-0.50+nmu2/lib/oracle-j2sdk-doc.sh	2013-01-14 19:09:57.000000000 -0400
@@ -7,8 +7,8 @@
 	    j2se_expected_min_size=44 #Mb
 	    found=true
 	    ;;
-	"jdk-7u"[0-9]"-apidocs.zip") # SUPPORTED
-	    j2se_version=1.7.0+update${archive_name:6:1}${revision}
+	"jdk-7u"[0-9][0-9]"-apidocs.zip") # SUPPORTED
+	    j2se_version=1.7.0+update${archive_name:6:2}${revision}
 	    j2se_expected_min_size=290 #Mb
 	    found=true
 	    ;;
diff -Nru java-package-0.50+nmu1/lib/oracle-j2sdk.sh java-package-0.50+nmu2/lib/oracle-j2sdk.sh
--- java-package-0.50+nmu1/lib/oracle-j2sdk.sh	2012-01-21 08:21:00.000000000 -0400
+++ java-package-0.50+nmu2/lib/oracle-j2sdk.sh	2013-01-14 19:09:38.000000000 -0400
@@ -12,8 +12,8 @@
 	    j2se_priority=315
 	    found=true
 	    ;;
-	"jdk-7u"[0-9]"-linux-i586.tar.gz") # SUPPORTED
-	    j2se_version=1.7.0+update${archive_name:6:1}${revision}
+	"jdk-7u"[0-9][0-9]"-linux-i586.tar.gz") # SUPPORTED
+	    j2se_version=1.7.0+update${archive_name:6:2}${revision}
 	    j2se_expected_min_size=190 #Mb
 	    j2se_priority=317
 	    found=true
@@ -28,8 +28,8 @@
 	    j2se_priority=315
 	    found=true
 	    ;;
-	"jdk-7u"[0-9]"-linux-x64.tar.gz") # SUPPORTED
-	    j2se_version=1.7.0+update${archive_name:6:1}${revision}
+	"jdk-7u"[0-9][0-9]"-linux-x64.tar.gz") # SUPPORTED
+	    j2se_version=1.7.0+update${archive_name:6:2}${revision}
 	    j2se_expected_min_size=180 #Mb
 	    j2se_priority=317
 	    found=true
diff -Nru java-package-0.50+nmu1/make-jpkg java-package-0.50+nmu2/make-jpkg
--- java-package-0.50+nmu1/make-jpkg	2012-02-08 19:52:45.000000000 -0400
+++ java-package-0.50+nmu2/make-jpkg	2013-01-14 19:23:39.000000000 -0400
@@ -70,10 +70,10 @@
 $program_name builds a Debian package from the given Java binary distribution FILE
 
 Supported java binary distributions currently include:
-  * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
-    - The J2SE Development Kit (JDK), version 6 (update >= 10), 7
-    - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7
-    - The J2SE API Javadoc, version 6 (update >= 10), 7
+  * Oracle (http://www.oracle.com/technetwork/java/javase/downloads):
+    - The J2SE Development Kit (JDK), version 6 and 7 (update >= 10)
+    - The J2SE Runtime Environment (JRE), version 6 and 7 (update >= 10)
+    - The J2SE API Javadoc, version 6 and 7 (update >= 10)
   (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
 
 The following options are recognized:
diff -Nru java-package-0.50+nmu1/make-jpkg.1 java-package-0.50+nmu2/make-jpkg.1
--- java-package-0.50+nmu1/make-jpkg.1	2012-02-08 19:52:45.000000000 -0400
+++ java-package-0.50+nmu2/make-jpkg.1	2013-01-14 19:42:49.000000000 -0400
@@ -29,10 +29,10 @@
 distribution FILE.
 .PP
 Supported java binary distributions currently include:
-  * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
-    - The J2SE Development Kit (JDK), version 6 (update >= 10), 7
-    - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7
-    - The J2SE API Javadoc, version 6 (update >= 10), 7
+  * Oracle (http://www.oracle.com/technetwork/java/javase/downloads):
+    - The J2SE Development Kit (JDK), version 6 and 7 (update >= 10)
+    - The J2SE Runtime Environment (JRE), version 6 and 7 (update >= 10)
+    - The J2SE API Javadoc, version 6 and 7 (update >= 10)
   (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
 .PP
 The following options are recognized:
@@ -70,17 +70,17 @@
 but you can specify an alternate directory by setting the environment
 variable \fITMPDIR\fR.
 .SH EXAMPLE
-To install Oracle(TM) 7 Standard Edition JDK, download a release - 64 bits version of update 2 from http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u2-download-1377129.html in this example - and invoke make-jpkg:
+To install Oracle(TM) 7 Standard Edition JDK, download a release - 64 bits version of update 11 from http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html in this example - and invoke make-jpkg:
 .IP
-make-jpkg <path_to_download_directory>/jdk-7u2-linux-x64.tar.gz
+make-jpkg <path_to_download_directory>/jdk-7u11-linux-x64.tar.gz
 .PP
 This generate a Debian package in the current directory, that can be installed using dpkg:
 .IP
-dpkg -i oracle-j2sdk1.7_1.7.0+update2_amd64.deb
+dpkg -i oracle-j2sdk1.7_1.7.0+update11_amd64.deb
 .PP
 When you're done, you can delete initial download as well as generated package:
 .IP
-rm <path_to_download_directory>/jdk-7u2-linux-x64.tar.gz oracle-j2sdk1.7_1.7.0+update2_amd64.deb
+rm <path_to_download_directory>/jdk-7u11-linux-x64.tar.gz oracle-j2sdk1.7_1.7.0+update11_amd64.deb
 .PP
 .SH ENVIRONMENT
 .TP

Attachment: signature.asc
Description: Digital signature

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to