[SCM] java-package packaging branch, master, updated. d7060e07977007ffbf5199efaf69e267febc999b

[Cédric Pineau]

The following commit has been merged in the master branch:
commit 1d5b21f43f7bc26ebc577c525ff461b9b9cb345e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Feb 6 11:44:55 2012 +0100

    Fixed the references to "Oracle Microsystems" and other brand inconsistencies
    
    Signed-off-by: Cédric Pineau <cedric.pineau at gmail.com>

diff --git a/lib/j2sdk-doc.sh b/lib/j2sdk-doc.sh
index 98bb9cf..4b30757 100644
--- a/lib/j2sdk-doc.sh
+++ b/lib/j2sdk-doc.sh
@@ -13,7 +13,7 @@ Description: $j2se_title
  Java(TM) platform.
  .
  This package provides the official API documentation published
- by Sun Microsystems.
+ by Oracle.
  .
  This package has been automatically created with java-package ($version).
 EOF
diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index 4ee450e..4e5d340 100644
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -43,14 +43,14 @@ oracle_j2re_detect() {
 Detected product:
     Java(TM) Runtime Environment (JRE)
     Standard Edition, Version $j2se_version
-    Oracle Microsystems(TM), Inc.
+    Oracle(TM)
 EOF
 	if read_yn "Is this correct [Y/n]: "; then
 	    j2se_found=true
 	    j2se_release="${j2se_version:0:3}"
 	    j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
 	    j2se_vendor="oracle"
-	    j2se_title="Java(TM) JRE, Standard Edition, Oracle Microsystems(TM)"
+	    j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)"
 
 	    j2se_install=oracle_j2re_install
 	    j2se_remove=oracle_j2re_remove
diff --git a/lib/oracle-j2sdk-doc.sh b/lib/oracle-j2sdk-doc.sh
index 8ac8d17..5b1487f 100644
--- a/lib/oracle-j2sdk-doc.sh
+++ b/lib/oracle-j2sdk-doc.sh
@@ -19,7 +19,7 @@ oracle_j2sdk_doc_detect() {
 Detected product:
     Java(TM) Development Kit (JDK) Documentation
     Standard Edition, Version $j2se_version
-    Oracle(TM), Inc.
+    Oracle(TM)
 EOF
 	if read_yn "Is this correct [Y/n]: "; then
 	    j2se_found=true
diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index 18b272f..c81334d 100644
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -43,7 +43,7 @@ oracle_j2sdk_detect() {
 Detected product:
     Java(TM) Development Kit (JDK)
     Standard Edition, Version $j2se_version
-    Oracle(TM), Inc.
+    Oracle(TM)
 EOF
 	if read_yn "Is this correct [Y/n]: "; then
 	    j2se_found=true

-- 
java-package packaging