#i119168# update granted extensions to match their ALv2 license

5 files changed, 14 insertions, 35 deletions

diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index cb659b379250..3acb7897dcac 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,12 +28,12 @@
     <identifier value="UPDATED_IDENTIFIER"/>
 
     <dependencies>
-        <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
+        <OpenOffice.org-minimal-version value="2.3" dep:name="Apache OpenOffice"/>
     </dependencies>
 
     <registration>
         <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"/>
+            <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
 
@@ -42,7 +42,7 @@
     <platform value="UPDATED_SUPPORTED_PLATFORM"/>
 
     <publisher>
-        <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
+        <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
     </publisher>
 
     <display-name>
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index b9d6fa2e7980..1a2b37178897 100644
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -27,12 +27,12 @@
     <identifier value="UPDATED_IDENTIFIER" />
 
     <dependencies>
-        <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+        <OpenOffice.org-minimal-version value="3.0" dep:name="Apache OpenOffice"/>
     </dependencies>
 
     <registration>
         <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"/>
+        <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
 
@@ -41,7 +41,7 @@
     <platform value="UPDATED_SUPPORTED_PLATFORM" />
 
     <publisher>
-        <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
+        <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
     </publisher>
 
     <display-name>
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index d1d497395935..d239616c7082 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -147,5 +147,6 @@ $(COMPONENT_HELP) : help$/$$(@:f)
 $(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
+
 .ENDIF # L10N_framework
 
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 7998d6d7b112..5b457e9a7a25 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -28,12 +28,12 @@
   <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
 
   <dependencies>
-    <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
+    <OpenOffice.org-minimal-version value="3.3" dep:name="Apache OpenOffice"/>
   </dependencies>
 
   <registration>
     <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"/>
+      <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
     </simple-license>
   </registration>
 
@@ -42,7 +42,7 @@
   <platform value="UPDATED_PLATFORM" />
 
   <publisher>
-      <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
+      <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
   </publisher>
 
   <display-name>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index e3f1c17a0e6e..87bcdb5e1aba 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -122,11 +122,7 @@ ZIP1LIST=		*
 
 DESCRIPTION:=$(ZIP1DIR)$/description.xml
 
-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i)
-.ELSE
-PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
-.ENDIF
+PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE
 
 .IF "$(WITH_LANG)"==""
 FIND_XCU=registry/data
@@ -362,16 +358,13 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
 .ENDIF
 
 
-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
+$(DESCRIPTION) : description.xml
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@
-.ELSE
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+
+$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@
-.ENDIF
-
 
 $(ZIP1DIR)/%.xcu : %.xcu
     @@-$(MKDIRHIER) $(@:d)
@@ -381,21 +374,6 @@ $(ZIP1DIR)$/%.xcs : %.xcs
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@
 
-# Temporary file that is used to replace some placeholders in description.xml.
-DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp
-
-.INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk
-.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-PHONYDESC=.PHONY
-.ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
-    @-$(MKDIRHIER) $(@:d)
-    $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP)
-    @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
-    $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $(DESCRIPTION_TMP)
-
-
 .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
 .ELSE
 ivo: