replace OOo to TDF or %PRODUCTNAME respectively fdo#37998

3 files changed, 78 insertions, 78 deletions

diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index 7d76ef7f95f6..d9948ca0c0c4 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -25,7 +25,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Presentation Minimizer extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -40,7 +40,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Report Builder extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -55,7 +55,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "MediaWiki publisher extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -70,7 +70,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Presenter Screen extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -85,7 +85,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "PDF import extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -101,7 +101,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Lightproof extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -116,7 +116,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Numbertext extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -131,7 +131,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Hungarian Cross-reference Toolbar extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -146,7 +146,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Typography Toolbar extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -161,7 +161,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "Copyright (c) 2008 Cor Nouws"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "ConvertTextToNumber extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -176,7 +176,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by Tibor Hornyák"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Watch Window extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -191,7 +191,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by OxygenOffice Professional"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Diagram extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -206,7 +206,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by OxygenOffice Professional"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Validator extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -221,7 +221,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by EuroOffice Extension Creator"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Barcode extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -236,7 +236,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by Przemyslaw Rumik"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Google Docs extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -251,7 +251,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by Sun Microsystems, Inc."
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "NLPSolver extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -266,7 +266,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2005-2009 by Daniel Naber"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "LanguageTool extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -281,7 +281,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2008 by Sun Mcrosystems, Inc."
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -296,7 +296,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2005 by Caolan McNamara"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "oooblogger extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -311,7 +311,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Script provider for BeanShell extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -326,7 +326,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Script provider for JavaScript extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -341,7 +341,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Script provider for Python extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 588487ee41d0..3d0f68ab7663 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -27,7 +27,7 @@ findrequires = "find-requires-gnome.sh"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Gnome integration module for LibreOffice %OOOBASEVERSION"
+description = "Gnome integration module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -42,7 +42,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "KDE integration module for LibreOffice %OOOBASEVERSION"
+description = "KDE integration module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -58,7 +58,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Core module for LibreOffice %OOOBASEVERSION"
+description = "Core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -74,7 +74,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Writer module for LibreOffice %OOOBASEVERSION"
+description = "Writer module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -90,7 +90,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Calc module for LibreOffice %OOOBASEVERSION"
+description = "Calc module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -106,7 +106,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Draw module for LibreOffice %OOOBASEVERSION"
+description = "Draw module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -122,7 +122,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Impress module for LibreOffice %OOOBASEVERSION"
+description = "Impress module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -137,8 +137,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSIONg-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Base module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Base module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -153,8 +153,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Math module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Math module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -168,8 +168,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Legacy filters (e.g. StarOffice 5.2) for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -183,8 +183,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Graphic filter module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Graphic filter module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -198,8 +198,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Usage tracking module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Usage tracking module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -213,8 +213,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Testtool module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Testtool module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -228,8 +228,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "English spellchecker module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "English spellchecker module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -243,8 +243,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "XSLT filter samples module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "XSLT filter samples module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -258,8 +258,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Java filter module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Java filter module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -273,8 +273,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "ActiveX control for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "ActiveX control for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -288,7 +288,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
-description = "Online update modul for OpenOffice.org %OOOBASEVERSION"
+description = "Online update modul for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -302,8 +302,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Pyuno module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Pyuno module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -317,8 +317,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Email mailmerge module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Email mailmerge module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -332,8 +332,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Headless display module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Headless display module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -347,8 +347,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Images module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Images module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -362,8 +362,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Mailcap module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Mailcap module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -377,8 +377,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Linguistic module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Linguistic module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -393,8 +393,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -408,8 +408,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -424,8 +424,8 @@ findrequires = "find-requires-x11.sh"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -439,8 +439,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -454,8 +454,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -469,8 +469,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -1077,8 +1077,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "OpenGL slide transitions module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index 69d9e1e62c17..d004d4f9fe83 100755
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -202,7 +202,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "SUN Template Pack (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
@@ -218,7 +218,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Lightproof (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"