[pkg-java] r4183 - in trunk/java-package: . debian lib
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Sun Sep 16 05:57:53 UTC 2007
Author: mkoch
Date: 2007-09-16 05:57:53 +0000 (Sun, 16 Sep 2007)
New Revision: 4183
Modified:
trunk/java-package/debian/changelog
trunk/java-package/lib/blackdown-j2re.sh
trunk/java-package/lib/blackdown-j2sdk.sh
trunk/java-package/lib/ibm-j2re.sh
trunk/java-package/lib/ibm-j2sdk.sh
trunk/java-package/lib/j2se.sh
trunk/java-package/lib/sun-j2re.sh
trunk/java-package/lib/sun-j2sdk-doc.sh
trunk/java-package/lib/sun-j2sdk.sh
trunk/java-package/make-jpkg
trunk/java-package/make-jpkg.1
Log:
java-package (0.35) unstable; urgency=low
* Use 'date -R' instead of the deprecated '822-date'. Closes: #441229.
* Fix generation of .changes file. Closes: #332643.
Thanks to Christoph Goehre for the patch.
* Add possibility to add a configured revision to the version.
Closes: #442246. Thanks to Christoph Goehre again for the patch.
-- Michael Koch <konqueror at gmx.de> Fri, 14 Sep 2007 17:28:13 +0200
Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/debian/changelog 2007-09-16 05:57:53 UTC (rev 4183)
@@ -1,3 +1,13 @@
+java-package (0.35) unstable; urgency=low
+
+ * Use 'date -R' instead of the deprecated '822-date'. Closes: #441229.
+ * Fix generation of .changes file. Closes: #332643.
+ Thanks to Christoph Goehre for the patch.
+ * Add possibility to add a configured revision to the version.
+ Closes: #442246. Thanks to Christoph Goehre again for the patch.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 14 Sep 2007 17:28:13 +0200
+
java-package (0.34) unstable; urgency=low
* Fixed SUN JDK on amd64. Closes: #439221.
Modified: trunk/java-package/lib/blackdown-j2re.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2re.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/blackdown-j2re.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -6,52 +6,52 @@
i386|i486-linux-gnu)
case "$archive_name" in
"j2re-1.3.1-02b-FCS-linux-i386.bin") # SUPPORTED
- j2se_version=1.3.1+02a
+ j2se_version=1.3.1+02a${revision}
j2se_expected_min_size=35 # 35882 kB
found=true
;;
"j2re-1.3.1-02b-FCS-linux-i386.bin") # SUPPORTED
- j2se_version=1.3.1+02b
+ j2se_version=1.3.1+02b${revision}
j2se_expected_min_size=35 # 35882 kB
found=true
;;
"j2re-1.4.1-01-linux-i586-gcc2.95.bin") # SUPPORTED
- j2se_version=1.4.1+01
+ j2se_version=1.4.1+01${revision}
j2se_expected_min_size=51 # 52631 kB
found=true
;;
"j2re-1.4.1-01-linux-i586-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.1+01
+ j2se_version=1.4.1+01${revision}
j2se_expected_min_size=48 # 49988 kB
found=true
;;
"j2re-1.4.2-rc1-linux-i586-gcc2.95.bin") # SUPPORTED
- j2se_version=1.4.2+rc1
+ j2se_version=1.4.2+rc1${revision}
j2se_expected_min_size=48 # 49988 kB
found=true
;;
"j2re-1.4.2-rc1-linux-i586-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.2+rc1
+ j2se_version=1.4.2+rc1${revision}
j2se_expected_min_size=48 # 49988 kB
found=true
;;
"j2re-1.4.2-fcs-linux-i586-gcc2.95.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=56 # 58044 kB
found=true
;;
"j2re-1.4.2-fcs-linux-i586-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=54 # 55524 kB
found=true
;;
"j2re-1.4.2-01-linux-i586.bin") # SUPPORTED
- j2se_version=1.4.2+01
+ j2se_version=1.4.2+01${revision}
j2se_expected_min_size=54 # 54958 kB
found=true
;;
"j2re-1.4.2-02-linux-i586.bin") # SUPPORTED
- j2se_version=1.4.2+02
+ j2se_version=1.4.2+02${revision}
j2se_expected_min_size=54 # 54958 kB
found=true
;;
@@ -60,12 +60,12 @@
sparc|sparc-linux)
case "$archive_name" in
"j2re-1.3.1-02b-FCS-linux-sparc.bin") # SUPPORTED
- j2se_version=1.3.1+02b
+ j2se_version=1.3.1+02b${revision}
j2se_expected_min_size=26 # 27064 kB
found=true
;;
"j2re-1.4.1-01-linux-sparc-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.1+01
+ j2se_version=1.4.1+01${revision}
j2se_expected_min_size=55 # 57084 kB
found=true
;;
@@ -74,22 +74,22 @@
amd64|x86_64-linux-gnu)
case "$archive_name" in
"j2re-1.4.2-rc1-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2+rc1
+ j2se_version=1.4.2+rc1${revision}
j2se_expected_min_size=53 # 54748 kB
found=true
;;
"j2re-1.4.2-fcs-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=54 # 55468 kB
found=true
;;
"j2re-1.4.2-01-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2+01
+ j2se_version=1.4.2+01${revision}
j2se_expected_min_size=54 # 55071 kB
found=true
;;
"j2re-1.4.2-02-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2+02
+ j2se_version=1.4.2+02${revision}
j2se_expected_min_size=54 # 55071 kB
found=true
;;
@@ -98,22 +98,22 @@
powerpc|powerpc-linux)
case "$archive_name" in
"j2re-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=10 # 11508915 bytes
found=true
;;
"j2re-1.3.1-02a-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1+02a
+ j2se_version=1.3.1+02a${revision}
j2se_expected_min_size=10 # 11010247 bytes
found=true
;;
"j2re-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1+02b
+ j2se_version=1.3.1+02b${revision}
j2se_expected_min_size=10 # 11027038 bytes
found=true
;;
"j2re-1.3.1-02c-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1+02c
+ j2se_version=1.3.1+02c${revision}
j2se_expected_min_size=10 # 11508915 bytes
found=true
;;
Modified: trunk/java-package/lib/blackdown-j2sdk.sh
===================================================================
--- trunk/java-package/lib/blackdown-j2sdk.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/blackdown-j2sdk.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -6,52 +6,52 @@
i386|i486-linux-gnu)
case "$archive_name" in
"j2sdk-1.3.1-02a-FCS-linux-i386.bin") # SUPPORTED
- j2se_version=1.3.1+02a
+ j2se_version=1.3.1+02a${revision}
j2se_expected_min_size=22 # 24.2 MB
found=true
;;
"j2sdk-1.3.1-02b-FCS-linux-i386.bin") # SUPPORTED
- j2se_version=1.3.1+02b
+ j2se_version=1.3.1+02b${revision}
j2se_expected_min_size=22 # 24 MB
found=true
;;
"j2sdk-1.4.1-01-linux-i586-gcc2.95.bin") # SUPPORTED
- j2se_version=1.4.1+01
+ j2se_version=1.4.1+01${revision}
j2se_expected_min_size=78 # 80653 kB
found=true
;;
"j2sdk-1.4.1-01-linux-i586-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.1+01
+ j2se_version=1.4.1+01${revision}
j2se_expected_min_size=76 # 78055 kB
found=true
;;
"j2sdk-1.4.2-rc1-linux-i586-gcc2.95.bin") # SUPPORTED
- j2se_version=1.4.2+rc1
+ j2se_version=1.4.2+rc1${revision}
j2se_expected_min_size=76 # 78055 kB
found=true
;;
"j2sdk-1.4.2-rc1-linux-i586-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.2+rc1
+ j2se_version=1.4.2+rc1${revision}
j2se_expected_min_size=76 # 78055 kB
found=true
;;
"j2sdk-1.4.2-fcs-linux-i586-gcc2.95.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=90 # 92740 kB
found=true
;;
"j2sdk-1.4.2-fcs-linux-i586-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=88 # 90316 kB
found=true
;;
"j2sdk-1.4.2-01-linux-i586.bin") # SUPPORTED
- j2se_version=1.4.2+01
+ j2se_version=1.4.2+01${revision}
j2se_expected_min_size=88 # 90316 kB
found=true
;;
"j2sdk-1.4.2-02-linux-i586.bin") # SUPPORTED
- j2se_version=1.4.2+02
+ j2se_version=1.4.2+02${revision}
j2se_expected_min_size=88 # 90316 kB
found=true
;;
@@ -60,12 +60,12 @@
sparc|sparc-linux)
case "$archive_name" in
"j2sdk-1.3.1-02b-FCS-linux-sparc.bin") # SUPPORTED
- j2se_version=1.3.1+02b
+ j2se_version=1.3.1+02b${revision}
j2se_expected_min_size=44 # 46048 kB
found=true
;;
"j2sdk-1.4.1-01-linux-sparc-gcc3.2.bin") # SUPPORTED
- j2se_version=1.4.1+01
+ j2se_version=1.4.1+01${revision}
j2se_expected_min_size=83 # 85712 kB
found=true
;;
@@ -74,22 +74,22 @@
amd64|x86_64-linux-gnu)
case "$archive_name" in
"j2sdk-1.4.2-rc1-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2+rc1
+ j2se_version=1.4.2+rc1${revision}
j2se_expected_min_size=86 # 88556 kB
found=true
;;
"j2sdk-1.4.2-fcs-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=89 # 91460 kB
found=true
;;
"j2sdk-1.4.2-01-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2+01
+ j2se_version=1.4.2+01${revision}
j2se_expected_min_size=89 # 90420 kB
found=true
;;
"j2sdk-1.4.2-02-linux-amd64.bin") # SUPPORTED
- j2se_version=1.4.2+02
+ j2se_version=1.4.2+02${revision}
j2se_expected_min_size=89 # 90420 kB
found=true
;;
@@ -98,22 +98,22 @@
powerpc|powerpc-linux)
case "$archive_name" in
"j2sdk-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=19 # 21776636 bytes
found=true
;;
"j2sdk-1.3.1-02a-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1+02a
+ j2se_version=1.3.1+02a${revision}
j2se_expected_min_size=19 # 21398886 bytes
found=true
;;
"j2sdk-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1+02b
+ j2se_version=1.3.1+02b${revision}
j2se_expected_min_size=20 # 21380823 bytes
found=true
;;
"j2sdk-1.3.1-02c-FCS-linux-ppc.bin") # SUPPORTED
- j2se_version=1.3.1+02c
+ j2se_version=1.3.1+02c${revision}
j2se_expected_min_size=19 # 21715354 bytes
found=true
;;
Modified: trunk/java-package/lib/ibm-j2re.sh
===================================================================
--- trunk/java-package/lib/ibm-j2re.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/ibm-j2re.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -6,17 +6,17 @@
i386|i486-linux-gnu)
case "$archive_name" in
"IBMJava2-JRE-131.tgz") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=20 # bytes
found=true
;;
"IBMJava2-JRE-142.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=37 # bytes
found=true
;;
"ibm-java2-jre-50-linux-i386.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=40 # 41655352 bytes
found=true
;;
@@ -25,12 +25,12 @@
amd64|x86_64-linux-gnu)
case "$archive_name" in
"IBMJava2-JRE-AMD64-142.x86_64.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=37
found=true
;;
"ibm-java2-jre-50-linux-x86_64.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=46 # 48018851 bytes
found=true
;;
@@ -39,22 +39,22 @@
powerpc|powerpc-linux)
case "$archive_name" in
"IBMJava2-JRE-131.ppc.tgz") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=20 # bytes
found=true
;;
"IBMJava2-JRE-142.ppc.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=40 # bytes
found=true
;;
"ibm-java2-jre-50-linux-ppc.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=42 # 43687702 bytes
found=true
;;
"ibm-java2-jre-5.0-5.0-linux-ppc.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=50 # 50066027 bytes
found=true
;;
@@ -63,12 +63,12 @@
powerpc64|powerpc64-linux)
case "$archive_name" in
"IBMJava2-JRE-142.ppc64.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=37
found=true
;;
"ibm-java2-jre-50-linux-ppc64.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=46 # 47734431 bytes
found=true
;;
@@ -77,32 +77,32 @@
s390|s390-linux)
case "$archive_name" in
"IBMJava2-JRE-131.s390.tgz") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=20
found=true
;;
"IBMJava2-JRE-141.s390.tgz") # SUPPORTED
- j2se_version=1.4.1
+ j2se_version=1.4.1${revision}
j2se_expected_min_size=31
found=true
;;
"IBMJava2-JRE-142.s390.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=34
found=true
;;
"IBMJava2-JRE-142.s390x.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=34
found=true
;;
"ibm-java2-jre-50-s390.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=42 # 43686815 bytes
found=true
;;
"ibm-java2-jre-50-s390x.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=42 # 43773066 bytes
found=true
;;
Modified: trunk/java-package/lib/ibm-j2sdk.sh
===================================================================
--- trunk/java-package/lib/ibm-j2sdk.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/ibm-j2sdk.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -6,22 +6,22 @@
i386|i486-linux-gnu)
case "$archive_name" in
"IBMJava2-SDK-131.tgz") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=52 # 60165118 bytes
found=true
;;
"IBMJava2-SDK-142.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=49 # 56719533 bytes
found=true
;;
"ibm-java2-sdk-50-linux-i386.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=56 # 58162719 bytes
found=true
;;
"ibm-java-sdk-60-linux-i386-20070329.tgz" ) # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=61 # 63942070 bytes
found=true
;;
@@ -30,17 +30,17 @@
amd64|x86_64-linux-gnu)
case "$archive_name" in
"IBMJava2-SDK-AMD64-142.x86_64.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=52
found=true
;;
"ibm-java2-sdk-50-linux-x86_64.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=57 # 59706399 bytes
found=true
;;
"ibm-java-sdk-60-linux-x86_64-20070329.tgz" ) # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=61 # 63942070 bytes
found=true
;;
@@ -49,27 +49,27 @@
powerpc|powerpc-linux)
case "$archive_name" in
"IBMJava2-SDK-131.ppc.tgz") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=51 # 58835697 bytes
found=true
;;
"IBMJava2-SDK-141.ppc.tgz") # SUPPORTED
- j2se_version=1.4.1
+ j2se_version=1.4.1${revision}
j2se_expected_min_size=49 # 57070530 bytes
found=true
;;
"IBMJava2-SDK-142.ppc.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=51 # 59313669 bytes
found=true
;;
"ibm-java2-sdk-50-linux-ppc.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=61 # 63942070 bytes
found=true
;;
"ibm-java-sdk-60-linux-ppc32-20070329.tgz" ) # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=61 # 63942070 bytes
found=true
;;
@@ -78,17 +78,17 @@
powerpc64|powerpc64-linux)
case "$archive_name" in
"IBMJava2-SDK-142.ppc64.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=55
found=true
;;
"ibm-java2-jre-50-linux-ppc64.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=61 # 63942070 bytes
found=true
;;
"ibm-java-sdk-60-linux-ppc64-20070329.tgz" ) # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=61 # 63942070 bytes
found=true
;;
@@ -97,37 +97,37 @@
s390|s390-linux)
case "$archive_name" in
"IBMJava2-SDK-131.s390.tgz") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=20
found=true
;;
"IBMJava2-SDK-141.s390.tgz") # SUPPORTED
- j2se_version=1.4.1
+ j2se_version=1.4.1${revision}
j2se_expected_min_size=51
found=true
;;
"IBMJava2-SDK-142.s390.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=52
found=true
;;
"IBMJava2-SDK-142.s390x.tgz") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=52
found=true
;;
"ibm-java2-sdk-50-s390.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=57 # 59685647 bytes
found=true
;;
"ibm-java2-sdk-50-s390x.tgz") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=57 # 59773265 bytes
found=true
;;
"ibm-java-sdk-60-linux-s390-20070329.tgz" ) # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=61 # 63942070 bytes
found=true
;;
Modified: trunk/java-package/lib/j2se.sh
===================================================================
--- trunk/java-package/lib/j2se.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/j2se.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -17,7 +17,7 @@
* This package was created with java-package ($version).
- -- $maintainer_name <$maintainer_email> $( 822-date )
+ -- $maintainer_name <$maintainer_email> $( date -R )
EOF
}
Modified: trunk/java-package/lib/sun-j2re.sh
===================================================================
--- trunk/java-package/lib/sun-j2re.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/sun-j2re.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -6,42 +6,42 @@
i386|i486-linux-gnu)
case "$archive_name" in
"j2re-1_4_1_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version="1.4.1+${archive_name:11:2}"
+ j2se_version="1.4.1+${archive_name:11:2}${revision}"
j2se_expected_min_size=14 # 14378891 bytes
found=true
;;
"j2re-1_4_2-linux-i586.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=14 # 14378891 bytes
found=true
;;
"j2re-1_4_2_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version="1.4.2+${archive_name:11:2}"
+ j2se_version="1.4.2+${archive_name:11:2}${revision}"
j2se_expected_min_size=15 # 14378891 bytes
found=true
;;
"j2re-1_5_0-beta2-linux-i586.bin") # SUPPORTED
- j2se_version=1.5.0+beta2
+ j2se_version=1.5.0+beta2${revision}
j2se_expected_min_size=16 # 16542512 bytes
found=true
;;
"jre-1_5_0-linux-i586.bin") # SUPPORTED
- j2se_version=1.5.0+update00
+ j2se_version=1.5.0+update00${revision}
j2se_expected_min_size=16 # 16542512 bytes
found=true
;;
"jre-1_5_0_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version=1.5.0+update${archive_name:10:2}
+ j2se_version=1.5.0+update${archive_name:10:2}${revision}
j2se_expected_min_size=16 # 16542512 bytes
found=true
;;
"jre-6-linux-i586.bin") # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=16 # 16542512 bytes
found=true
;;
"jre-6u"[0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version=1.6.0+update${archive_name:6:1}
+ j2se_version=1.6.0+update${archive_name:6:1}${revision}
j2se_expected_min_size=16 # 16542512 bytes
found=true
;;
@@ -50,17 +50,17 @@
amd64|x86_64-linux-gnu)
case "$archive_name" in
"jre-1_5_0-linux-amd64.bin") # SUPPORTED
- j2se_version=1.5.0+update00
+ j2se_version=1.5.0+update00${revision}
j2se_expected_min_size=65 # 69936 kB
found=true
;;
"jre-1_5_0_"[0-9][0-9]"-linux-amd64.bin") # SUPPORTED
- j2se_version=1.5.0+update${archive_name:10:2}
+ j2se_version=1.5.0+update${archive_name:10:2}${revision}
j2se_expected_min_size=60 # 69936 kB
found=true
;;
"jre-6u"[0-9]"-linux-amd64.bin") # SUPPORTED
- j2se_version=1.6.0+update${archive_name:6:1}
+ j2se_version=1.6.0+update${archive_name:6:1}${revision}
j2se_expected_min_size=16 # 16542512 bytes
found=true
;;
Modified: trunk/java-package/lib/sun-j2sdk-doc.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk-doc.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/sun-j2sdk-doc.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -3,32 +3,32 @@
local found=
case "$archive_name" in
"j2sdk-1_3_1-doc.zip") # SUPPORTED
- j2se_version=1.3.1
+ j2se_version=1.3.1${revision}
j2se_expected_min_size=22 # 22049 kB
found=true
;;
"j2sdk-1_4_2-doc.zip") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=33 # 33592 kB
found=true
;;
"j2sdk-1_4_2-doc-ja.zip") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=87 # 89150 kB
found=true
;;
"jdk-1_5_0-doc.zip") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=46 # 46386 kB
found=true
;;
"jdk-1_5_0-doc-ja.zip") # SUPPORTED
- j2se_version=1.5.0
+ j2se_version=1.5.0${revision}
j2se_expected_min_size=44 # 44566 kB
found=true
;;
"jdk-6-doc.zip") # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=44 # 44566 kB
found=true
;;
Modified: trunk/java-package/lib/sun-j2sdk.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk.sh 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/lib/sun-j2sdk.sh 2007-09-16 05:57:53 UTC (rev 4183)
@@ -6,47 +6,47 @@
i386|i486-linux-gnu)
case "$archive_name" in
"j2sdk-1_4_1_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version="1.4.1+${archive_name:12:2}"
+ j2se_version="1.4.1+${archive_name:12:2}${revision}"
j2se_expected_min_size=77 # 79515 kB
found=true
;;
"j2sdk-1_4_2-linux-i586.bin") # SUPPORTED
- j2se_version=1.4.2
+ j2se_version=1.4.2${revision}
j2se_expected_min_size=87 # 89150 kB
found=true
;;
"j2sdk-1_4_2_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version="1.4.2+${archive_name:12:2}"
+ j2se_version="1.4.2+${archive_name:12:2}${revision}"
j2se_expected_min_size=87 # 89281 kB
found=true
;;
"jdk-1_5_0-beta2-linux-i586.bin") # SUPPORTED
- j2se_version=1.5.0+beta2
+ j2se_version=1.5.0+beta2${revision}
j2se_expected_min_size=122 # 125899 kB
found=true
;;
"jdk-1_5_0-linux-i586.bin") # SUPPORTED
- j2se_version=1.5.0+update00
+ j2se_version=1.5.0+update00${revision}
j2se_expected_min_size=134 # 136608 kB
found=true
;;
"jdk-1_5_0_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version=1.5.0+update${archive_name:10:2}
+ j2se_version=1.5.0+update${archive_name:10:2}${revision}
j2se_expected_min_size=130
found=true
;;
"jdk-6-beta-linux-i586.bin") # SUPPORTED
- j2se_version=1.6.0+beta
+ j2se_version=1.6.0+beta${revision}
j2se_expected_min_size=130
found=true
;;
"jdk-6-linux-i586.bin") # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=130
found=true
;;
"jdk-6u"[0-9]"-linux-i586.bin") # SUPPORTED
- j2se_version=1.6.0+update${archive_name:6:1}
+ j2se_version=1.6.0+update${archive_name:6:1}${revision}
j2se_expected_min_size=130
found=true
;;
@@ -55,12 +55,12 @@
ia64|ia64-linux-gnu)
case "$archive_name" in
"j2sdk-1_4_1-linux-ia64.bin") # SUPPORTED
- j2se_version=1.4.1
+ j2se_version=1.4.1${revision}
j2se_expected_min_size=86 # 88452 kB
found=true
;;
"j2sdk-1_4_2_"[0-9][0-9]"-linux-ia64.bin") # SUPPORTED
- j2se_version="1.4.2+${archive_name:12:2}"
+ j2se_version="1.4.2+${archive_name:12:2}${revision}"
j2se_expected_min_size=107 # 109256 kB
found=true
;;
@@ -69,27 +69,27 @@
amd64|x86_64-linux-gnu)
case "$archive_name" in
"jdk-1_5_0-beta2-linux-amd64.bin") # SUPPORTED
- j2se_version=1.5.0+beta2
+ j2se_version=1.5.0+beta2${revision}
j2se_expected_min_size=108 # 110956 kB
found=true
;;
"jdk-1_5_0-linux-amd64.bin") # SUPPORTED
- j2se_version=1.5.0+update00
+ j2se_version=1.5.0+update00${revision}
j2se_expected_min_size=110 # 112940 kB
found=true
;;
"jdk-1_5_0_"[0-9][0-9]"-linux-amd64.bin") # SUPPORTED
- j2se_version=1.5.0+update${archive_name:10:2}
+ j2se_version=1.5.0+update${archive_name:10:2}${revision}
j2se_expected_min_size=105
found=true
;;
"jdk-6-linux-amd64.bin") # SUPPORTED
- j2se_version=1.6.0
+ j2se_version=1.6.0${revision}
j2se_expected_min_size=130
found=true
;;
"jdk-6u"[0-9]"-linux-amd64.bin") # SUPPORTED
- j2se_version=1.6.0+update${archive_name6:1}
+ j2se_version=1.6.0+update${archive_name6:1}${revision}
j2se_expected_min_size=130
found=true
;;
Modified: trunk/java-package/make-jpkg
===================================================================
--- trunk/java-package/make-jpkg 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/make-jpkg 2007-09-16 05:57:53 UTC (rev 4183)
@@ -31,9 +31,36 @@
fi
genchanges=""
-faker00ted=false
+### check for run in fakeroot
+# are we running as fakeroot
+if ! dh_testroot >/dev/null 2>&1; then
+ if [ -n "$FAKEROOTKEY" ]; then
+ echo "Internal error, fakeroot seems to fail faking root" >&2
+ exit 1
+ fi
+ exec fakeroot "$0" "$@"
+fi
+
+# check whether I'm real root, and bail out if so... ugly, but needed
+if touch /lib/.test 2>/dev/null; then
+ rm -f /lib/.test
+ echo "You are real root -- unfortunately, some Java distributions have" >&2
+ echo "install scripts that directly manipulate /etc, and may cause some" >&2
+ echo "inconsistencies on your system. Instead, you should become a" >&2
+ echo "non-root user and run:" >&2
+ echo >&2
+ echo "fakeroot make-jpkg $@" >&2
+ echo >&2
+ echo "which will allow no damage to be done to your system files and" >&2
+ echo "still permit the Java distribution to successfully extract." >&2
+ echo >&2
+ echo "Aborting." >&2
+ exit 1
+fi
+
+
### Parse options
function print_usage() {
@@ -45,6 +72,7 @@
--full-name NAME full name used in the maintainer field of the package
--email EMAIL email address used in the maintainer field of the package
--changes create a .changes file
+ --revision add debian revision
--help display this help and exit
--version output version information and exit
@@ -84,10 +112,12 @@
[ $# -le 1 ] && missing_argument "$1"
shift
maintainer_email="$1"
+ elif [[ "x$1" == x--revision ]]; then
+ [ $# -le 1 ] && missing_argument "$1"
+ shift
+ revision="-${1}"
elif [[ "x$1" == x--changes ]]; then
genchanges="true"
- elif [[ "x$1" == x--faker00ted ]]; then
- faker00ted="true"
else
unrecognized_option "$1"
fi
@@ -116,33 +146,7 @@
archive_dir="$( cd "$( dirname "$archive" )" ; pwd )"
archive_path="$archive_dir/$archive_name"
-# must be run as fakeroot
-if ! dh_testroot >/dev/null 2>&1; then
- if $faker00ted; then
- echo "Internal error, fakeroot seems to fail faking root" >&2
- exit 1
- fi
- exec fakeroot "$0" --faker00ted "$@"
-fi
-# check whether I'm real root, and bail out if so... ugly, but needed
-if touch /lib/.test 2>/dev/null; then
- rm -f /lib/.test
- echo "You are real root -- unfortunately, some Java distributions have" >&2
- echo "install scripts that directly manipulate /etc, and may cause some" >&2
- echo "inconsistencies on your system. Instead, you should become a" >&2
- echo "non-root user and run:" >&2
- echo >&2
- echo "fakeroot make-jpkg $@" >&2
- echo >&2
- echo "which will allow no damage to be done to your system files and" >&2
- echo "still permit the Java distribution to successfully extract." >&2
- echo >&2
- echo "Aborting." >&2
- exit 1
-fi
-
-
# error handling
success=
Modified: trunk/java-package/make-jpkg.1
===================================================================
--- trunk/java-package/make-jpkg.1 2007-09-15 20:30:02 UTC (rev 4182)
+++ trunk/java-package/make-jpkg.1 2007-09-16 05:57:53 UTC (rev 4183)
@@ -42,6 +42,9 @@
.B --changes
create a .changes file
.TP
+.B --revision
+add debian revision
+.TP
.B --help
display help text and exit
.TP
More information about the pkg-java-commits
mailing list