openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1431253 [3/4] - in /openoffice/trunk/main: cli_ure/source/basetypes/ cli_ure/source/native/ cli_ure/source/ure/ cli_ure/unotypes/ cppuhelper/source/ desktop/util/ desktop/win32/source/applauncher/ooo/ filter/source/config/cache/ filter/sou...
Date Thu, 10 Jan 2013 10:10:59 GMT
Modified: openoffice/trunk/main/setup_native/source/packinfo/package_names.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/package_names.txt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/package_names.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/package_names.txt Thu Jan 10 10:10:56 2013
@@ -1,46 +1,46 @@
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING	Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base	Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter	Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc	Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw	Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts	Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help	Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress	Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math	Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd	Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res	Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer	Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex	ActiveX control for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base	Base module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter	Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc	Calc module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01	Core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07	Office core module for OpenOffice.org %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING	Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base	Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter	Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc	Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw	Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts	Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help	Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress	Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math	Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd	Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res	Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer	Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex	ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base	Base module for %APACHEPROJECTNAME%OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter	Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc	Calc module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01	Core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-gl	Gl dictionary for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi	Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw	Draw module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge	Email mailmerge module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn	Gnome integration module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter	Graphic filter module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless	Headless display module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images	Images module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress	Impress module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter	Java filter module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration	KDE integration module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math	Math module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate	Online update modul for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts	Mailcap module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic	Linguistic module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno	Pyuno module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck	English spellchecker module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool	Testtool module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer	Writer module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter	XSLT filter samples module for OpenOffice.org %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw	Draw module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge	Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn	Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter	Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless	Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images	Images module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress	Impress module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter	Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration	KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math	Math module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate	Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts	Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic	Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno	Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck	English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool	Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer	Writer module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter	XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af	Af dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs	Cs dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da	Da dictionary for %PRODUCTNAME %PRODUCTVERSION

Modified: openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt Thu Jan 10 10:10:56 2013
@@ -48,7 +48,7 @@ findrequires = "find-requires-gnome.sh"
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Gnome integration module for OpenOffice.org %OOOBASEVERSION"
+description = "Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "KDE integration module for OpenOffice.org %OOOBASEVERSION"
+description = "KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -79,7 +79,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX%O
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Core module for OpenOffice.org %OOOBASEVERSION"
+description = "Core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Writer module for OpenOffice.org %OOOBASEVERSION"
+description = "Writer module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Calc module for OpenOffice.org %OOOBASEVERSION"
+description = "Calc module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Draw module for OpenOffice.org %OOOBASEVERSION"
+description = "Draw module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Impress module for OpenOffice.org %OOOBASEVERSION"
+description = "Impress module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Base module for OpenOffice.org %OOOBASEVERSION"
+description = "Base module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Math module for OpenOffice.org %OOOBASEVERSION"
+description = "Math module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -190,7 +190,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION"
+description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -205,7 +205,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Graphic filter module for OpenOffice.org %OOOBASEVERSION"
+description = "Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -220,7 +220,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Usage tracking module for OpenOffice.org %OOOBASEVERSION"
+description = "Usage tracking module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -235,7 +235,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Testtool module for OpenOffice.org %OOOBASEVERSION"
+description = "Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -250,7 +250,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "English spellchecker module for OpenOffice.org %OOOBASEVERSION"
+description = "English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -265,7 +265,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "XSLT filter samples module for OpenOffice.org %OOOBASEVERSION"
+description = "XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -280,7 +280,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Java filter module for OpenOffice.org %OOOBASEVERSION"
+description = "Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -295,7 +295,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "ActiveX control for OpenOffice.org %OOOBASEVERSION"
+description = "ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -309,7 +309,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Online update modul for OpenOffice.org %OOOBASEVERSION"
+description = "Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -324,7 +324,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Pyuno module for OpenOffice.org %OOOBASEVERSION"
+description = "Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -339,7 +339,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Email mailmerge module for OpenOffice.org %OOOBASEVERSION"
+description = "Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -354,7 +354,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Headless display module for OpenOffice.org %OOOBASEVERSION"
+description = "Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -369,7 +369,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Images module for OpenOffice.org %OOOBASEVERSION"
+description = "Images module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -384,7 +384,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Mailcap module for OpenOffice.org %OOOBASEVERSION"
+description = "Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -399,7 +399,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Linguistic module for OpenOffice.org %OOOBASEVERSION"
+description = "Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -415,7 +415,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -430,7 +430,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -446,7 +446,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -461,7 +461,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -476,7 +476,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -491,7 +491,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -1035,7 +1035,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION"
+description = "OpenGL slide transitions module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End

Modified: openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt Thu Jan 10 10:10:56 2013
@@ -47,7 +47,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -79,7 +79,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
@@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
@@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
@@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
@@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
@@ -191,7 +191,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
@@ -207,7 +207,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
@@ -223,7 +223,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"

Modified: openoffice/trunk/main/setup_native/source/packinfo/packinfo_sdkoo.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/packinfo_sdkoo.txt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/packinfo_sdkoo.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/packinfo_sdkoo.txt Thu Jan 10 10:10:56 2013
@@ -29,7 +29,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Software Development Kit for OpenOffice.org %OOOBASEVERSION"
+description = "Software Development Kit for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End

Modified: openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt Thu Jan 10 10:10:56 2013
@@ -29,12 +29,12 @@ END
 platform=`uname -s`
 case $$platform in
 SunOS)
-  BASISPACKAGE=openofficeorg-core01
+  BASISPACKAGE=apacheopenoffice-core01
   BASISDIR=`pkginfo -r $$BASISPACKAGE`
   PRODUCTINSTALLLOCATION="$$BASEDIR"
   ;;
 Linux)
-  BASISPACKAGE=openoffice.org-core01
+  BASISPACKAGE=apacheopenoffice-core01
   BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE`
   PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
   ;;
@@ -44,11 +44,11 @@ Linux)
 esac
 
 # creating link to basis layer
-if [ -d $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION ]
+if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]
 then
-      ln -s $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+      ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
 else
-      ln -s ../openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+      ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
 fi
 
 exit 0

Modified: openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt Thu Jan 10 10:10:56 2013
@@ -44,11 +44,11 @@ Linux)
 esac
 
 # creating link to ure
-if [ -d $$UREDIR/openoffice.org/ure ]
+if [ -d $$UREDIR/apacheopenoffice/ure ]
 then
-      ln -s $$UREDIR/openoffice.org/ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+      ln -s $$UREDIR/apacheopenoffice/ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
 else
-      ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+      ln -s ../ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
 fi
 
 exit 0
@@ -80,11 +80,11 @@ Linux)
   ;;
 esac
 
-if [ -h $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
+if [ -h $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
 then
-  rm -f $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
-  rmdir $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION 2>/dev/null
-  rmdir $$PRODUCTINSTALLLOCATION/openoffice.org 2>/dev/null
+  rm -f $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
+  rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION 2>/dev/null
+  rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice 2>/dev/null
 fi
 
 exit 0

Modified: openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx Thu Jan 10 10:10:56 2013
@@ -124,8 +124,8 @@ UINT GetInstallProperty(MSIHANDLE handle
     Try to find the installation path to an already installed product.
     The installation path will be written in the Windows registry
     during the installation. There may exist different products in 
-    parallel e.g. StarOffice, StarSuite, OpenOffice.org. It will be 
-    searched in this order for an installed product. If a product
+    parallel e.g. StarOffice, StarSuite, OpenOffice.org, Apache OpenOffice.
+    It will be     searched in this order for an installed product. If a product
     will be found the path to the product will be set in the property
     "INSTALLLOCATION" else nothing will be done.
 */

Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx Thu Jan 10 10:10:56 2013
@@ -113,6 +113,10 @@ static BOOL CheckExtensionInRegistry( LP
                 bRet = true;
             }
             else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 )
+            {   // We will replace registration for our (former) own types, too
+                bRet = true;
+            }
+            else if ( strncmp( szBuffer, "Apache OpenOffice.", 18 ) == 0 )
             {   // We will replace registration for our own types, too
                 bRet = true;
             }

Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx Thu Jan 10 10:10:56 2013
@@ -77,10 +77,10 @@ namespace /* private */
 
 Registrar::Registrar(const RegistrationContextInformation& RegContext) : 	
 	m_ContextInformation(RegContext),
-    FORWARD_KEY_PREFIX(L"OpenOffice.org"),//FORWARD_KEY_PREFIX(L"soffice6"),
+    FORWARD_KEY_PREFIX(L"Apache OpenOffice"),
     DEFAULT_VALUE_NAME(L""),
     BACKUP_VALUE_NAME(L"Backup"),
-    PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.org.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
+    PRIVATE_BACKUP_KEY_NAME(L"Apache OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
     REGISTRATION_STATE(L"Reg4MsDocState")
 {
     m_RootKey = WindowsRegistry().GetClassesRootKey();

Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx Thu Jan 10 10:10:56 2013
@@ -305,8 +305,7 @@ std::wstring RegistrationContextInformat
 std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMMAND ShellCommand,
                                                                       OFFICE_APPLICATION OfficeApp) const
 {
-	// quote the path to OpenOffice, this is important
-	// for Windows 9x
+	// quote the path to Apache OpenOffice, this is important for Windows 9x
 	std::wstring cmd_line = std::wstring(TEXT("\"")) + m_OOExecPath + std::wstring(TEXT("\""));
 
     switch( OfficeApp )

Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx Thu Jan 10 10:10:56 2013
@@ -45,7 +45,7 @@
 	document display name is convertable to an ANSI
 	string and if not returns an english default.
 	So we avoid garbage if soemone for instance
-	installs an japanese StarOffice/OpenOffice
+	installs an japanese version
 	under a German Windows 98 for instance.
 */
 class RegistrationContextInformation  
@@ -150,7 +150,7 @@ public:
 	*/
 	std::wstring GetOpenOfficeFriendlyAppName() const;
 
-	/** The path to the StarOffice/OpenOffice executable 
+	/** The path to the office executable 
 	*/
 	std::wstring GetOpenOfficeExecutablePath() const;
 

Modified: openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx Thu Jan 10 10:10:56 2013
@@ -158,7 +158,7 @@ extern "C" UINT __stdcall ShowSurveyAfte
     std::wstring prodname;
 
     GetMsiProp( handle, TEXT("ProductName"), prodname );
-	std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice.org" ) );
+	std::wstring::size_type nIndex = prodname.find( TEXT( "Apache OpenOffice" ) );
 	if( std::wstring::npos == nIndex )
 	    return ERROR_SUCCESS;
 
@@ -170,7 +170,8 @@ extern "C" UINT __stdcall ShowSurveyAfte
     aExecInf.cbSize = sizeof( aExecInf );
     aExecInf.fMask  = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
     aExecInf.lpVerb = TEXT("open");
-    aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");
+    //aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");
+    aExecInf.lpFile = TEXT("http://www.openoffice.org/support/");
     aExecInf.lpDirectory = NULL;
     aExecInf.nShow = SW_SHOWNORMAL;
 

Modified: openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx Thu Jan 10 10:10:56 2013
@@ -54,10 +54,10 @@
     </MSDN>
     
     We add the following entries to the respective registry key
-    "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice.org Column Handler"
-    "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice.org Infotip Handler"
-    "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice.org Property Sheet Handler"
-    "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice.org Thumbnail Viewer"
+    "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler"
+    "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler"
+    "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler"
+    "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache OpenOffice Thumbnail Viewer"
     
     These shell extensions are implemented in the 'shell' project. We ignore registration 
     failures because of insufficient privileges. The reason is: On systems which restrict the
@@ -90,10 +90,10 @@ struct RegistryEntry
     TCHAR* Value;
 };
 
-RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice.org Column Handler") };
-RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice.org Infotip Handler") };
-RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice.org Property Sheet Handler") };
-RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice.org Thumbnail Viewer") };
+RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("Apache OpenOffice Column Handler") };
+RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") };
+RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") };
+RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache OpenOffice Thumbnail Viewer") };
 
 BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
 {

Modified: openoffice/trunk/main/setup_native/source/win32/stwrapper/stwrapper.manifest
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/stwrapper/stwrapper.manifest?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/stwrapper/stwrapper.manifest (original)
+++ openoffice/trunk/main/setup_native/source/win32/stwrapper/stwrapper.manifest Thu Jan 10 10:10:56 2013
@@ -7,7 +7,7 @@
         version="1.0.0.0"
         processorArchitecture="x86"
     />
-	<description>OpenOffice.org Installer</description>
+	<description>Apache OpenOffice Installer</description>
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
         <security>
             <requestedPrivileges>

Modified: openoffice/trunk/main/shell/inc/internal/config.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/inc/internal/config.hxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/shell/inc/internal/config.hxx (original)
+++ openoffice/trunk/main/shell/inc/internal/config.hxx Thu Jan 10 10:10:56 2013
@@ -40,10 +40,10 @@
 #define MODULE_NAME_FILTER TEXT("ooofilt.dll")
 #endif
 
-#define COLUMN_HANDLER_DESCRIPTIVE_NAME    TEXT("OpenOffice.org Column Handler")
-#define INFOTIP_HANDLER_DESCRIPTIVE_NAME   TEXT("OpenOffice.org Infotip Handler")
-#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Property Sheet Handler")
-#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice.org Thumbnail Viewer")
+#define COLUMN_HANDLER_DESCRIPTIVE_NAME    TEXT("Apache OpenOffice Column Handler")
+#define INFOTIP_HANDLER_DESCRIPTIVE_NAME   TEXT("Apache OpenOffice Infotip Handler")
+#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler")
+#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache OpenOffice Thumbnail Viewer")
 
 #define META_CONTENT_NAME               "meta.xml"
 #define DOC_CONTENT_NAME                "content.xml"

Modified: openoffice/trunk/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/unix/sysshell/recently_used_file_handler.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/unix/sysshell/recently_used_file_handler.cxx (original)
+++ openoffice/trunk/main/shell/source/unix/sysshell/recently_used_file_handler.cxx Thu Jan 10 10:10:56 2013
@@ -405,7 +405,7 @@ namespace /* private */ {
     };
     
     //------------------------------------------------
-    const char* GROUP_OOO         = "openoffice.org";
+    const char* GROUP_OOO         = "apacheopenoffice";
     const char* GROUP_STAR_OFFICE = "staroffice";
     const char* GROUP_STAR_SUITE  = "starsuite";
     

Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx Thu Jan 10 10:10:56 2013
@@ -1197,7 +1197,7 @@ namespace /* private */
         std::string ClsidEntry = CLSID_GUID_ENTRY;
         SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid));
     
-		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org Filter"))
+		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org XML Filter"))
             return E_FAIL;	
         
         ClsidEntry = CLSID_GUID_INPROC_ENTRY;
@@ -1225,7 +1225,7 @@ namespace /* private */
         SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
     
 		
-		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler"))
+		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))
             return E_FAIL;	
 
 		// Add missing entry 

Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx Thu Jan 10 10:10:56 2013
@@ -56,11 +56,11 @@ struct PROPERTYMAP
 
 PROPERTYMAP g_rgPROPERTYMAP[] =
 {
-    { PKEY_Title,          L"OpenOffice.org",          L"Title" },
-    { PKEY_Author,         L"OpenOffice.org",          L"Author" },
-    { PKEY_Subject,        L"OpenOffice.org",          L"Subject" },
-    { PKEY_Keywords,       L"OpenOffice.org",          L"Keyword" },
-    { PKEY_Comment,        L"OpenOffice.org",          L"Comments" },
+    { PKEY_Title,          L"Apache OpenOffice",          L"Title" },
+    { PKEY_Author,         L"Apache OpenOffice",          L"Author" },
+    { PKEY_Subject,        L"Apache OpenOffice",          L"Subject" },
+    { PKEY_Keywords,       L"Apache OpenOffice",          L"Keyword" },
+    { PKEY_Comment,        L"Apache OpenOffice",          L"Comments" },
 };
 
 size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);

Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest Thu Jan 10 10:10:56 2013
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice.shlxthdl" type="win32" />
-<description>OpenOffice Shell Extension</description>
+<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />
+<description>Apache OpenOffice Shell Extension</description>
 <dependency>
 <dependentAssembly>
 <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"

Modified: openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx (original)
+++ openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx Thu Jan 10 10:10:56 2013
@@ -129,7 +129,7 @@ namespace /* private */
     {
         rtl::OUString altSenddocUrl;
         HKEY hkey;
-        LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice.org\\SendAsEMailClient", &hkey);
+        LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Apache OpenOffice\\SendAsEMailClient", &hkey);
         if (lret == ERROR_SUCCESS)
         {
             wchar_t buff[MAX_PATH];

Modified: openoffice/trunk/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/download.pm?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/download.pm Thu Jan 10 10:10:56 2013
@@ -461,21 +461,44 @@ sub get_downloadname_language
 
 sub get_downloadname_productname
 {
-	my ($allvariables) = @_;
-
-	my $start = "Apache_OpenOffice";
-
-	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }
-
-	if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }
-
-	if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }
+    my ($allvariables) = @_;
 
-	if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-SDK"; }
+    my $start;
 
-	if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start .= "-URE"; }
+    if ( $allvariables->{'AOODOWNLOADNAMEPREFIX'} )
+    {
+        $start = $allvariables->{'AOODOWNLOADNAMEPREFIX'};
+    }
+    else
+    {
+        $start = "Apache_OpenOffice";
+        if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" ) 
+        {
+            if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+            {
+                $start .= "-SDK"; 
+            }
+        }
+
+        if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" ) 
+        {
+            if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+            {
+                $start .= "-Dev-SDK"; 
+            }
+            else
+            {
+                $start .= "-Dev";
+            }
+        }
+
+        if ( $allvariables->{'PRODUCTNAME'} eq "URE" )
+        {
+            $start .= "-URE";
+        }
+    }
 
-	return $start;
+    return $start;
 }
 
 #########################################################
@@ -1968,8 +1991,14 @@ sub create_download_sets
 
 	# evaluating the name of the download file
 
-	if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); }
-	else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); }
+	if ( $allvariableshashref->{'AOODOWNLOADNAME'} ) 
+    { 
+        $downloadname = set_download_filename($languagestringref, $allvariableshashref); 
+    }
+	else 
+    { 
+        $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); 
+    }
 
 	if ( ! $installer::globals::iswindowsbuild )	# Unix specific part
 	{
@@ -1978,7 +2007,7 @@ sub create_download_sets
 		my $getuidlibrary = "";
 		if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) {	$getuidlibrary = get_path_for_library($includepatharrayref); }
 
-		if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
+		if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
 		{
 			my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
 		}

Modified: openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm Thu Jan 10 10:10:56 2013
@@ -326,11 +326,11 @@ sub create_epm_header
 	my $line = "";
 	my $infoline = "";
 		
-	# %product OpenOffice.org Software
+	# %product Apache OpenOffice Software
 	# %version 2.0
 	# %description A really great software
 	# %copyright 1999-2003 by OOo
-	# %vendor OpenOffice.org
+	# %vendor Apache OpenOffice project
 	# %license /test/replace/01/LICENSE01
 	# %readme /test/replace/01/README01
 	# %requires foo
@@ -492,7 +492,7 @@ sub create_epm_header
 	{
 		# refer to the license in the matching AOO installation
 		# TODO: sync AOO dest license full path with lpacks/sdks/exts
-		my $licpath = "openoffice.org3/program/" . $licensefilename;
+		my $licpath = "apacheopenoffice3/program/" . $licensefilename;
 		$foundlicensefile = 1;
 		$line = "%license " . $licpath . "\n";
 		push(@epmheader, $line);
@@ -550,7 +550,7 @@ sub create_epm_header
 				}
 			}
 
-			if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' )
+			if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache openoffice' )
 			{
 				$line = "%provides" . " openoffice.org-unbundled\n";
 				push(@epmheader, $line);

Modified: openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm Thu Jan 10 10:10:56 2013
@@ -333,7 +333,10 @@ sub replace_variables_in_scriptfile
 	replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
 	
 	my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
-	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }
+	if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+    {
+        $scriptname = "org.openoffice.script";
+    }
 
 	replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
 }
@@ -616,7 +619,7 @@ sub create_simple_package
 
 		my $locallanguage = $installer::globals::csp_languagestring;
 
-		if ( $allvariables->{'OOODOWNLOADNAME'} )
+		if ( $allvariables->{'AOODOWNLOADNAME'} )
 		{
 			$packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);
 		}

Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm Thu Jan 10 10:10:56 2013
@@ -884,7 +884,7 @@ sub change_patchmetadata_table
 	if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
 
 	my $manufacturerstring = "ManufacturerName";
-	my $manufacturervalue = "OpenOffice.org";
+	my $manufacturervalue = "Apache OpenOffice";
 	if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
 
 	my $displaynamestring = "DisplayName";

Modified: openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm Thu Jan 10 10:10:56 2013
@@ -639,7 +639,7 @@ sub set_manufacturer
 {
 	my ($allvariables) = @_;
 	
-	my $openofficeproductname = "OpenOffice.org";
+	my $openofficeproductname = "Apache OpenOffice";
 	my $sunname = "";
 	
 	

Modified: openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx Thu Jan 10 10:10:56 2013
@@ -93,7 +93,7 @@ namespace svx{
 
 			if ( ERROR_SUCCESS == RegReadValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("HTTPProxyServer"),
 				szBuffer,
 				sizeof(szBuffer) ) )
@@ -102,7 +102,7 @@ namespace svx{
 			DWORD	dwProxyPort;
 			if ( ERROR_SUCCESS == RegReadValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("HTTPProxyPort"),
 				&dwProxyPort,
 				sizeof(dwProxyPort) ) )
@@ -113,7 +113,7 @@ namespace svx{
 
 			if ( ERROR_SUCCESS == RegReadValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("ReturnAddress"),
 				szBuffer,
 				sizeof(szBuffer) ) )
@@ -122,7 +122,7 @@ namespace svx{
 			DWORD	fAllowContact = sal_False;
 			RegReadValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("AllowContact"),
 				&fAllowContact,
 				sizeof(fAllowContact) );
@@ -131,7 +131,7 @@ namespace svx{
 			DWORD	uInternetConnection = 0;
 			RegReadValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("HTTPConnection"),
 				&uInternetConnection,
 				sizeof(uInternetConnection) );
@@ -145,7 +145,7 @@ namespace svx{
 			const _TCHAR	*lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer());
 			RegWriteValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("HTTPProxyServer"), REG_SZ,
 				lpHTTPProxyServer,
 				sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );
@@ -155,7 +155,7 @@ namespace svx{
 
 			RegWriteValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("HTTPProxyPort"), REG_DWORD,
 				&dwProxyPort,
 				sizeof(DWORD) );
@@ -163,7 +163,7 @@ namespace svx{
 			DWORD	fAllowContact = IsContactAllowed();
 			RegWriteValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("AllowContact"), REG_DWORD,
 				&fAllowContact,
 				sizeof(DWORD) );
@@ -173,7 +173,7 @@ namespace svx{
 
 			RegWriteValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("HTTPConnection"), REG_DWORD,
 				&uInternetConnection,
 				sizeof(DWORD) );
@@ -181,7 +181,7 @@ namespace svx{
 			const _TCHAR	*lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer());
 			RegWriteValue(
 				HKEY_CURRENT_USER,
-				TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+				TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
 				TEXT("ReturnAddress"), REG_SZ,
 				lpEmail,
 				sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );

Modified: openoffice/trunk/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/control?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/debian/control (original)
+++ openoffice/trunk/main/sysui/desktop/debian/control Thu Jan 10 10:10:56 2013
@@ -1,6 +1,6 @@
 Description: %productname desktop integration
 Maintainer: Apache Software Foundation
 Architecture: all
-Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
-Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
+Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled
+Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
+Replaces: apache_openoffice-desktop-integration, openofficeorg-debian-menus

Modified: openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec Thu Jan 10 10:10:56 2013
@@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus
 #BuildRequires: perl
 Group: Office
 License: ALv2
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
 Conflicts: %pkgprefix-redhat-menus

Modified: openoffice/trunk/main/sysui/desktop/macosx/Info.plist
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/macosx/Info.plist?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/macosx/Info.plist (original)
+++ openoffice/trunk/main/sysui/desktop/macosx/Info.plist Thu Jan 10 10:10:56 2013
@@ -32,7 +32,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -80,7 +80,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.spreadsheet</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -128,7 +128,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.presentation</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -178,7 +178,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.graphics</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -226,7 +226,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text-master</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -272,7 +272,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.formula</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -320,7 +320,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -366,7 +366,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.spreadsheet-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -412,7 +412,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.presentation-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -458,7 +458,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.graphics-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -868,7 +868,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>text.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -906,7 +906,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>spreadsheet.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -946,7 +946,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>presentation.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -984,7 +984,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>drawing.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1020,7 +1020,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>master-document.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1058,7 +1058,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>formula.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1094,7 +1094,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>text-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1130,7 +1130,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>spreadsheet-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1166,7 +1166,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>presentation-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1202,7 +1202,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>drawing-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>

Modified: openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec Thu Jan 10 10:10:56 2013
@@ -33,7 +33,7 @@ BuildArch: noarch
 #        here and check for the 'mandriva-release' in the future (next year).
 #
 Requires: mandrake-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
 
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1

Modified: openoffice/trunk/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/productversion.mk?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/productversion.mk (original)
+++ openoffice/trunk/main/sysui/desktop/productversion.mk Thu Jan 10 10:10:56 2013
@@ -40,8 +40,9 @@ PKGDIR=$(BIN)
 .ENDIF
 
 # CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
-# but should not be. When replacing with $(UNIXBASISROOTNAME) it will be empty (!)
-PRODUCTLIST = openoffice.org
+# but should not be.
+# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
+PRODUCTLIST = apache_openoffice
 
 # default values to minimize maintainance effort
 
@@ -65,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/./
 UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
 
 # CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.openoffice.org = OpenOffice.org
+PRODUCTNAME.apache_openoffice = Apache OpenOffice
 
-PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.openoffice.org = $(PKGVERSION)
-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)
-ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
+PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.apache_openoffice = $(PKGVERSION)
+UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)
+ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)
 

Modified: openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec Thu Jan 10 10:10:56 2013
@@ -29,7 +29,7 @@ Vendor: Apache Software Foundation
 AutoReqProv: no
 BuildArch: noarch
 Requires: redhat-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
 %define _binary_payload w9.gzdio

Modified: openoffice/trunk/main/sysui/desktop/share/brand.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/brand.pl?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/brand.pl (original)
+++ openoffice/trunk/main/sysui/desktop/share/brand.pl Thu Jan 10 10:10:56 2013
@@ -34,8 +34,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 $destdir = pop @ARGV;
 mkdir $destdir,0777;
 
-$productname = "OpenOffice.org";
-$productfilename = "openoffice";
+$productname = "Apache OpenOffice";
+$productfilename = "apacheopenoffice";
 $prefix = "";
 $iconprefix = "";
 

Modified: openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl (original)
+++ openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl Thu Jan 10 10:10:56 2013
@@ -21,7 +21,7 @@
 # *************************************************************
 use File::Basename;
 $basedir = dirname($0);
-$productname = 'OpenOffice.org';
+$productname = 'Apache OpenOffice';
 $mimedir = $basedir.'/../mimetypes';
 
 $FS= ' ';		# field seperator (space) - for documents.ulf 

Modified: openoffice/trunk/main/sysui/desktop/share/create_tree.sh
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/create_tree.sh?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/create_tree.sh (original)
+++ openoffice/trunk/main/sysui/desktop/share/create_tree.sh Thu Jan 10 10:10:56 2013
@@ -121,8 +121,8 @@ cp printeradmin.sh ${DESTDIR}/usr/bin/${
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
 mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
+cp apacheopenoffice.xml ${DESTDIR}/usr/share/mime/packages/
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/apacheopenoffice.xml
 
 mkdir -p ${DESTDIR}/usr/share/applications
 for i in `cat launcherlist`; do

Modified: openoffice/trunk/main/sysui/desktop/share/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/makefile.mk?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/share/makefile.mk Thu Jan 10 10:10:56 2013
@@ -157,8 +157,8 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) 
 #
 # Create shared mime info xml file
 #
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf
 	@echo Create shared mime info xml file ..
 	@echo ---------------------------------
 	@$(PERL) create_mime_xml.pl $< > $@.$(INPATH)
@@ -173,8 +173,8 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoff
 	@@-$(MKDIRHIER) $(@:d)
 	@echo Creating GNOME .keys file for $(@:d:d:f) ..
 	@echo ---------------------------------
-	@$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
-	@$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
+	@$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
+	@$(PERL) translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
 	@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
 	@mv -f $@.$(INPATH) $@
 
@@ -249,7 +249,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.f
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \
-	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml	\
+	$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml	\
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh
 	@touch $@

Modified: openoffice/trunk/main/sysui/desktop/share/translate.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/translate.pl?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/translate.pl (original)
+++ openoffice/trunk/main/sysui/desktop/share/translate.pl Thu Jan 10 10:10:56 2013
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 
 my ($prefix, $ext, $key);
-$productname = "OpenOffice.org";
+$productname = "Apache OpenOffice";
 $workdir = ".";
 
 while ($_ = $ARGV[0], /^-/) {

Modified: openoffice/trunk/main/sysui/desktop/solaris/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/solaris/makefile.mk?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/solaris/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/solaris/makefile.mk Thu Jan 10 10:10:56 2013
@@ -94,9 +94,9 @@ $(MISC)/{$(PRODUCTLIST)}/postremove : $$
 # --- openoffice.xml---------------------------
 
 .IF "$(common_build)"=="TRUE"
-# Copy the openoffice.org.xml file to $(MISC) 
-#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) :  $(COMMONMISC)/$$(@:b)/openoffice.org.xml
-$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) :  $(COMMONMISC)/$$(@:b)/openoffice.org.xml
+# Copy the apacheopenoffice.xml file to $(MISC) 
+#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) :  $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
+$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/apacheopenoffice.xml) :  $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
 	$(MKDIRHIER) $(@:d)
 	echo hier hier $@
 	cat $< | tr -d "\015" > $@
@@ -112,7 +112,7 @@ $(MISC)/{$(PRODUCTLIST)}$/prototype : $$
 # --- packaging ---------------------------------------------------
 
 #$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
-$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml
+$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/apacheopenoffice.xml
 $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
 	@-$(RM) $(BIN)$/$(@:f)
 	@$(MKDIRHIER) $(@:d)

Modified: openoffice/trunk/main/sysui/desktop/solaris/prototype
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/solaris/prototype?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/solaris/prototype (original)
+++ openoffice/trunk/main/sysui/desktop/solaris/prototype Thu Jan 10 10:10:56 2013
@@ -21,7 +21,7 @@ d none share/mime/packages 0755 root oth
 !default 0644 root bin
 e build etc/mime.types=./mime.types
 e build etc/mailcap=mailcap
-f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/openoffice.org.xml
+f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/apacheopenoffice.xml
 f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications
 s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop
 s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop

Modified: openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec Thu Jan 10 10:10:56 2013
@@ -32,7 +32,7 @@ BuildArch: noarch
 Requires: /etc/SuSE-release
 # .. but not for Sun JDS
 Conflicts: SunDesktopVersion
-Provides: openoffice.org3-desktop-integration
+Provides: apacheopenoffice3-desktop-integration
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
 %define _binary_payload w9.gzdio

Modified: openoffice/trunk/main/unoil/climaker/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unoil/climaker/makefile.mk?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/unoil/climaker/makefile.mk (original)
+++ openoffice/trunk/main/unoil/climaker/makefile.mk Thu Jan 10 10:10:56 2013
@@ -64,8 +64,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA
 		$(CLIMAKER) $(CLIMAKERFLAGS) \
 		--out $@ \
  		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
-		--assembly-company "OpenOffice.org" \
-		--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+		--assembly-company "Apache OpenOffice" \
+		--assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
 		-X $(EXTRA_RDB) \
 		-r $(SOLARBINDIR)$/cli_uretypes.dll \
         --keyfile $(SOLARBINDIR)$/cliuno.snk \

Modified: openoffice/trunk/main/vcl/source/app/settings.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/settings.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/app/settings.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/settings.cxx Thu Jan 10 10:10:56 2013
@@ -1167,7 +1167,7 @@ sal_Bool MiscSettings::GetEnableATToolSu
         HKEY hkey;
 
         if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-            "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+            "Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport",
             &hkey) )
         {
             DWORD dwType;
@@ -1245,7 +1245,7 @@ void MiscSettings::SetEnableATToolSuppor
 
         // If the accessibility key in the Windows registry exists, change it synchronously
 		if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-			"Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+			"Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
 			&hkey) )
 		{
 			DWORD dwType;



Mime
View raw message