native0ext:#161688# rebranding extensions - transplanted from 28f77bc32e70@native0

6 files changed, 10 insertions, 9 deletions

diff --git a/reportbuilder/images/em42.png b/reportbuilder/images/em42.png
index 31f48ea8fb69..4906707257bf 100644..100755
--- a/reportbuilder/images/em42.png
+++ b/reportbuilder/images/em42.png
diff --git a/reportbuilder/images/em42_hc.png b/reportbuilder/images/em42_hc.png
index 3870cc4709d4..f04df059c4ae 100644..100755
--- a/reportbuilder/images/em42_hc.png
+++ b/reportbuilder/images/em42_hc.png
diff --git a/reportbuilder/util/component.txt b/reportbuilder/util/component.txt
index 17f312c8ea72..3b6ba3156efc 100644
--- a/reportbuilder/util/component.txt
+++ b/reportbuilder/util/component.txt
@@ -1 +1 @@
-Create with the Sun Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports.
+Create with the Oracle Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports.
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index c254d5bd1a73..9a495af0fd71 100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -3,11 +3,11 @@
     xmlns:d="http://openoffice.org/extensions/description/2006"
     xmlns:xlink="http://www.w3.org/1999/xlink">
   <display-name>
-    <name lang="en-US">Sun Report Builder</name>
+    <name lang="en-US">Oracle Report Builder</name>
     <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
   </display-name>
   <registration>
-    <simple-license accept-by="admin" default-license-id="lic-en-US" >
+    <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
             <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
     </simple-license>
   </registration>
@@ -17,11 +17,14 @@
     <OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/>
   </dependencies>
   <publisher>
-    <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Sun Microsystems, Inc.</name>
+    <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle, Inc.</name>
   </publisher>
   <icon>
     <default xlink:href="images/em42.png" />
     <high-contrast xlink:href="images/em42_hc.png" />
   </icon>
+  <extension-description>
+    <src xlink:href="help/component.txt" lang="en" />
+  </extension-description>
 </description>
 
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index f36b1f50406c..1c69f01333cf 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..
 PRJNAME=reportbuilder
 TARGET=rpt
-EXTENSION_VERSION_BASE=1.2.0
+EXTENSION_VERSION_BASE=1.2.1
 
 .IF "$(CWS_WORK_STAMP)" == ""
     EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
@@ -41,8 +41,8 @@ EXTENSION_VERSION_BASE=1.2.0
 .IF "$(L10N_framework)"==""
 # ------------------------------------------------------------------
 # calready set in util$/makefile.pmk
-# EXTENSIONNAME:=sun-report-builder
-EXTENSION_ZIPNAME:=sun-report-builder
+# EXTENSIONNAME:=oracle-report-builder
+EXTENSION_ZIPNAME:=oracle-report-builder
 
 # create Extension -----------------------------
 
diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/manifest.xml
index 8ea30b6ad08e..1a5a0f84623b 100644
--- a/reportbuilder/util/manifest.xml
+++ b/reportbuilder/util/manifest.xml
@@ -3,5 +3,3 @@
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
                       manifest:full-path="sun-report-builder.jar"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
-                      manifest:full-path="help/component.txt"/>