Changed the short description of the generate packages to match the official name

diff --git a/debian/changelog b/debian/changelog
index 41944142e50da023ca5679461de313a99dfd1d73..0dc86f4c6c8f7ea28cd1289a24445489a0dff0c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ java-package (0.53) UNRELEASED; urgency=low
     by dh_shlibdeps)
   * Removed the references to "Java 2" from the description of the generated
     JRE package
+  * Changed the short description of the generate packages to match
+    the official name
 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
 

diff --git a/lib/oracle-jdk-doc.sh b/lib/oracle-jdk-doc.sh
index e66ea814de4506de35d4622c4b09d13976acce8d..1cc6d8674e67713a4e31cfda03650ded9524049f 100644 (file)
--- a/lib/oracle-jdk-doc.sh
+++ b/lib/oracle-jdk-doc.sh
@@ -59,7 +59,7 @@ EOF
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
-      j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM) Documentation"
+      j2se_title="Java™ Platform, Standard Edition $j2se_release Documentation"
 
       j2se_install=oracle_j2sdk_doc_install
       j2se_remove=oracle_j2sdk_doc_remove

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index dd8dee8e8b3bb77146570e479d9fcf3c5b5bcb77..18a84ed32d85e37320e9c80d0df217d6d8ffaf3d 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -87,7 +87,7 @@ EOF
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
-      j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM)"
+      j2se_title="Java™ Platform, Standard Edition $j2se_release Development Kit"
 
       j2se_install=oracle_j2sdk_install
       j2se_remove=oracle_j2sdk_remove

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index 4a563bc209ece9ef8a4c9c563d500cd0efba8288..b558835d2c31d4c6d6890a2050c09f1a55d82005 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -71,7 +71,7 @@ EOF
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
-      j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)"
+      j2se_title="Java™ Platform, Standard Edition $j2se_release Runtime Environment"
 
       j2se_install=oracle_j2re_install
       j2se_remove=oracle_j2re_remove