Removed obsolete OOOBASEVERSION, OOOPACKAGEVERSION.

With the basis/brand split undone, they are always the same as
PRODUCTVERSION and ABOUTBOXPRODUCTVERSION, respectively.

10 files changed, 595 insertions, 595 deletions

diff --git a/setup_native/scripts/langpackscript.sh b/setup_native/scripts/langpackscript.sh
index bf221909ebf4..e0e162491143 100644
--- a/setup_native/scripts/langpackscript.sh
+++ b/setup_native/scripts/langpackscript.sh
@@ -46,7 +46,7 @@ done
 
 case $platform in
 SunOS)
-  SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01"
+  SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDERPRODUCTVERSIONPLACEHOLDER-core01"
   echo
   echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..."
   PACKAGENAME=`pkginfo -x | grep $SEARCHPACKAGENAME | sed "s/ .*//"`
@@ -59,7 +59,7 @@ SunOS)
   fi
   ;;
 Linux)
-  SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01"
+  SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDERPRODUCTVERSIONPLACEHOLDER-core01"
   FIXPATH="/openoffice.org"
   echo
   echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..."
diff --git a/setup_native/source/opensolaris/bundledextensions/installed b/setup_native/source/opensolaris/bundledextensions/installed
index 0c8d8df5ae26..f9ccdb6dfe8f 100644
--- a/setup_native/source/opensolaris/bundledextensions/installed
+++ b/setup_native/source/opensolaris/bundledextensions/installed
@@ -1 +1 @@
-${OOOPACKAGEVERSION}
+${ABOUTBOXPRODUCTVERSION}
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index 44c4fa1e0cc7..377267e685de 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -1,46 +1,46 @@
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING	Language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base	Base language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter	Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc	Calc language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw	Draw language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts	Language fonts module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help	Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress	Impress language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math	Math language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd	Online update language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res	Language resource module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer	Writer language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex	ActiveX control for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base	Base module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter	Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc	Calc module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01	Core module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02	Office core module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03	Office core module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04	Office core module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05	Office core module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06	Office core module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07	Office core module for LibreOffice %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 LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge	Email mailmerge module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn	Gnome integration module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter	Graphic filter module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless	Headless display module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images	Images module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress	Impress module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter	Java filter module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration	KDE integration module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math	Math module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate	Online update modul for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts	Mailcap module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic	Linguistic module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno	Pyuno module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck	English spellchecker module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool	Testtool module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer	Writer module for LibreOffice %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter	XSLT filter samples module for LibreOffice %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING	Language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-base	Base language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-binfilter	Legacy filters (e.g. StarOffice 5.2) for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-calc	Calc language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-draw	Draw language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-fonts	Language fonts module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-help	Language help module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-impress	Impress language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-math	Math language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-onlineupd	Online update language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-res	Language resource module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-writer	Writer language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-activex	ActiveX control for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-base	Base module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-binfilter	Legacy filters (e.g. StarOffice 5.2) for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-calc	Calc module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01	Core module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02	Office core module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03	Office core module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04	Office core module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05	Office core module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06	Office core module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07	Office core module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-dict-gl	Gl dictionary for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-dict-vi	Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-draw	Draw module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-emailmerge	Email mailmerge module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-gnome-integratn	Gnome integration module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-graphicfilter	Graphic filter module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-headless	Headless display module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-images	Images module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-impress	Impress module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-javafilter	Java filter module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-kde-integration	KDE integration module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-math	Math module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-onlineupdate	Online update modul for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-ooofonts	Mailcap module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-ooolinguistic	Linguistic module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-pyuno	Pyuno module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-spellcheck	English spellchecker module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-testtool	Testtool module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-writer	Writer module for LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-xsltfilter	XSLT filter samples module for LibreOffice %PRODUCTVERSION
 %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
diff --git a/setup_native/source/packinfo/packinfo_accessories.txt b/setup_native/source/packinfo/packinfo_accessories.txt
index 6b6e780f1eb1..183657f76648 100644
--- a/setup_native/source/packinfo/packinfo_accessories.txt
+++ b/setup_native/source/packinfo/packinfo_accessories.txt
@@ -21,51 +21,51 @@
 
 Start
 module = "gid_Module_Optional_Accessories_Gallery"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-gallery"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-gallery"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extra-gallery"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-gallery"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2008 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 # 2/3 Fonts
 
 Start
 module = "gid_Module_Optional_Accessories_Fonts"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-fonts"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-fonts"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extra-fonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-fonts"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2008 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 # 3/3 Templates - Common
 
 Start
 module = "gid_Module_Optional_Accessories_Tem_Common"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-templates-common"
-solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-templates-common"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extra-templates-common"
+solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-templates-common"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2008 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Extra Common Templates for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 476227771718..9f0ead9633f0 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -29,8 +29,8 @@ Start
 module = "gid_Module_Root_Brand"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-images"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%BASISPACKAGEPREFIX%PRODUCTVERSION-images"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -43,8 +43,8 @@ Start
 module = "gid_Module_Brand_Prg_Wrt"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-writer"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -57,8 +57,8 @@ Start
 module = "gid_Module_Brand_Prg_Calc"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-calc"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -71,8 +71,8 @@ Start
 module = "gid_Module_Brand_Prg_Impress"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-impress"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -85,8 +85,8 @@ Start
 module = "gid_Module_Brand_Prg_Draw"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-draw"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-draw"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-draw"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -99,8 +99,8 @@ Start
 module = "gid_Module_Brand_Prg_Math"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-math"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-math"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-math"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -113,8 +113,8 @@ Start
 module = "gid_Module_Brand_Prg_Base"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-base"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-base"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -127,8 +127,8 @@ Start
 module = "gid_Module_Langpack_Brand"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index d9948ca0c0c4..6ddc810c99f6 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -18,10 +18,10 @@
 
 Start
 module = "gid_Module_Optional_Extensions_MINIMIZER"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presentation-minimizer"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presentation-minimizer"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-presentation-minimizer"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-presentation-minimizer"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -33,10 +33,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_REPORTDESIGN"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-report-builder"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-report-builder"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-report-builder"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-report-builder"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -48,10 +48,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_MEDIAWIKI"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mediawiki-publisher"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mediawiki-publisher"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-mediawiki-publisher"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mediawiki-publisher"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -63,10 +63,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_PRESENTER_SCREEN"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presenter-screen"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presenter-screen"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-presenter-screen"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-presenter-screen"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -78,10 +78,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_PDFIMPORT"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-pdf-import"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-pdf-import"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-pdf-import"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-pdf-import"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -94,10 +94,10 @@ End
 Start
 module = "gid_Module_Optional_Extensions_LightProof"
 script = "shellscripts_extensions.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-lightproof"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-lightproof"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-lightproof"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-lightproof"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
@@ -109,10 +109,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_NumberText"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-numbertext"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-numbertext"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-numbertext"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-numbertext"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
@@ -124,10 +124,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_HunArt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-hunart"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-hunart"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-hunart"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-hunart"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
@@ -139,10 +139,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Typo"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-typo"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-typo"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-typo"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-typo"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2010 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
@@ -154,10 +154,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_CT2N"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-ct2n"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-ct2n"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-ct2n"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-ct2n"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "Copyright (c) 2008 Cor Nouws"
 solariscopyright = "solariscopyrightfile"
@@ -169,10 +169,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Watch_Window"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-watch-window"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-watch-window"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-watch-window"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-watch-window"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2009 by Tibor Hornyák"
 solariscopyright = "solariscopyrightfile"
@@ -184,10 +184,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Diagram"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-diagram"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-diagram"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-diagram"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-diagram"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2010 by OxygenOffice Professional"
 solariscopyright = "solariscopyrightfile"
@@ -199,10 +199,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Validator"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-validator"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-validator"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-validator"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-validator"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2010 by OxygenOffice Professional"
 solariscopyright = "solariscopyrightfile"
@@ -214,10 +214,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Barcode"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-barcode"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-barcode"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-barcode"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-barcode"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2010 by EuroOffice Extension Creator"
 solariscopyright = "solariscopyrightfile"
@@ -229,10 +229,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Google_Docs"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-google-docs"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-google-docs"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-google-docs"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-google-docs"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2009 by Przemyslaw Rumik"
 solariscopyright = "solariscopyrightfile"
@@ -244,10 +244,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_NLPSolver"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-nlpsolver"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-nlpsolver"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-nlpsolver"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-nlpsolver"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2009 by Sun Microsystems, Inc."
 solariscopyright = "solariscopyrightfile"
@@ -259,10 +259,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_LanguageTool"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-languagetool"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-languagetool"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-languagetool"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-languagetool"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2005-2009 by Daniel Naber"
 solariscopyright = "solariscopyrightfile"
@@ -274,10 +274,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_MySQLConnector"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mysql-connector"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mysql-connector"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-mysql-connector"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mysql-connector"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2008 by Sun Mcrosystems, Inc."
 solariscopyright = "solariscopyrightfile"
@@ -289,10 +289,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_OOoBlogger"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-oooblogger"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-oooblogger"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-oooblogger"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-oooblogger"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "2005 by Caolan McNamara"
 solariscopyright = "solariscopyrightfile"
@@ -304,10 +304,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Script_Provider_For_Beanshell"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-beanshell-script-provider"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-beanshell-script-provider"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-beanshell-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-beanshell-script-provider"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -319,10 +319,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Script_Provider_For_Javascript"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-javascript-script-provider"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-javascript-script-provider"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-javascript-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-javascript-script-provider"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -334,10 +334,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Script_Provider_For_Python"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-python-script-provider"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-python-script-provider"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-python-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-python-script-provider"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 63bb1fe5a3f2..e74b6872b40b 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -18,470 +18,470 @@
 
 Start
 module = "gid_Module_Optional_Gnome"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWgnome-config, SUNWgnome-vfs, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-gnome-integration"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-gnome-integratn"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, SUNWgnome-config, SUNWgnome-vfs, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-gnome-integration"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 findrequires = "find-requires-gnome.sh"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Gnome integration module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Kde"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-kde-integration"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-kde-integration"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-kde-integration"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "KDE integration module for %PRODUCTNAME %OOOBASEVERSION"
+description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root"
 # script = "shellscripts_core01.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
 solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Core module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Prg_Wrt_Bin"
 script = "shellscripts_module.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-writer"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-writer"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, SUNWlibC"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Writer module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Prg_Calc_Bin"
 script = "shellscripts_module.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-calc"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-calc"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Calc module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Prg_Draw_Bin"
 script = "shellscripts_module.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-draw"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-draw"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-draw"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Draw module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Prg_Impress_Bin"
 script = "shellscripts_module.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-impress"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Impress module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Prg_Base_Bin"
 script = "shellscripts_module.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-base"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSIONg-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-base"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSIONg-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Base module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Prg_Math_Bin"
 script = "shellscripts_module.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-math"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-math"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-math"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Math module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Binfilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-binfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" 
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-binfilter"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-binfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" 
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for %PRODUCTNAME %OOOBASEVERSION"
+description = "Legacy filters (e.g. StarOffice 5.2) for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Grfflt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-graphicfilter"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-graphicfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Graphic filter module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Oooimprovement"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-oooimprovement"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-oooimprovement"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-oooimprovement"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,SUNWmfrun"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-oooimprovement"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Usage tracking module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Usage tracking module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Testtool"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-testtool"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-testtool"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05,SUNWmfrun"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-testtool"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Testtool module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Oo_English"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-spellcheck"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-spellcheck"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-spellcheck"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "English spellchecker module for %PRODUCTNAME %OOOBASEVERSION"
+description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Xsltfiltersamples"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-xsltfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-xsltfilter"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-xsltfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "XSLT filter samples module for %PRODUCTNAME %OOOBASEVERSION"
+description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Javafilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-javafilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-javafilter"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-javafilter"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Java filter module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Activexcontrol"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-activex"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-activex"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-activex"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "ActiveX control for %PRODUCTNAME %OOOBASEVERSION"
+description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Onlineupdate"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC, SUNWgzip"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-onlineupdate"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-onlineupdate"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, SUNWlibC, SUNWgzip"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-onlineupdate"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
-description = "Online update modul for %PRODUCTNAME %OOOBASEVERSION"
+description = "Online update modul for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Pyuno"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWPython"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-pyuno"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, SUNWPython"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Pyuno module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Pymailmerge"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-emailmerge"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-emailmerge"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-pyuno"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-emailmerge"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Email mailmerge module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Headless"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-headless"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-headless"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-headless"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Headless display module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Headless display module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Files_Images"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-images"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-images"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-images"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Images module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Images module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Fonts_OOo_Hidden"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ooofonts"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-ooofonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Mailcap module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Oo_Linguistic"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ooolinguistic"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-ooolinguistic"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooolinguistic"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Linguistic module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Linguistic module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Files_2"
 script = "shellscripts_module.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC, SUNWmfrun"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, SUNWlibC, SUNWmfrun"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core02"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Files_3"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core03"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core03"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Files_4"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04"
-solarisrequires = "SUNWfreetype2, SUNWgnome-base-libs, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core04"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04"
+solarisrequires = "SUNWfreetype2, SUNWgnome-base-libs, SUNWlibC, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core04"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 findrequires = "find-requires-x11.sh"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Files_5"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWgnome-base-libs, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core05"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, SUNWgnome-base-libs, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core05"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Files_6"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core06"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core06"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Files_7"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
+description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Extension_Oooimprovement"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-oooimprovement"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-oooimprovement"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -495,9 +495,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Af"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-af"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -511,9 +511,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Ar"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ar"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ar"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2006-2008 by Mohamed Kebdani, 2006-2009 Taha Zerrouki"
 solariscopyright = "solariscopyrightfile"
@@ -527,9 +527,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Bg"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bg"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bg"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "Copyright (C) 2001 Anton Zinoviev, Borislav Mitev, Radostin Radnev"
 solariscopyright = "solariscopyrightfile"
@@ -543,9 +543,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Bn"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bn"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bn"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2002 Dr Abhijit Das, 2002 Taneem Ahmed, 2008 Jamil Ahmed"
 solariscopyright = "solariscopyrightfile"
@@ -559,9 +559,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Br"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2009-2011 by An Drouizig"
 solariscopyright = "solariscopyrightfile"
@@ -575,9 +575,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Ca"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ca"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -591,9 +591,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Cs"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-cs"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -607,9 +607,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Da"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-da"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -623,9 +623,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_De"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -639,9 +639,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_En"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-en"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -655,9 +655,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Es"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-es"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -671,9 +671,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Et"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-et"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-et"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -687,9 +687,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Fr"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fr"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -703,41 +703,41 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Gl"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gl"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-dict-gl"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-dict-gl"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
 description = "Gl dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Extension_Dictionary_Gu"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gu"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-dict-gu"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-dict-gu"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2009 by Kartik Mistry"
 solariscopyright = "solariscopyrightfile"
 vendor = "SUSE"
 description = "Gu dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Extension_Dictionary_He"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-he"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-he"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -751,9 +751,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Hi"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hi"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hi"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2005 Swapnil {Hajare, Sant}"
 solariscopyright = "solariscopyrightfile"
@@ -767,9 +767,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Hu"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hu"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hu"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -783,9 +783,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Hr"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hr"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hr"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2003-2010 by Denis Lackovic"
 solariscopyright = "solariscopyrightfile"
@@ -799,9 +799,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_It"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-it"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -815,9 +815,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Ku_Tr"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2009 by Sun Microsystems"
 solariscopyright = "solariscopyrightfile"
@@ -831,9 +831,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Lt"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lt"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -847,9 +847,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Lv"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lv"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lv"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2004-2005 Janis Vilims, 2002-2010 Janis Eisaks"
 solariscopyright = "solariscopyrightfile"
@@ -863,9 +863,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Ne"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ne"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ne"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -879,9 +879,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Nl"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-nl"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-nl"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -895,9 +895,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_No"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-no"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-no"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -911,9 +911,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Oc"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-oc"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-oc"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "2006-2011 by Bruno Gallart"
 solariscopyright = "solariscopyrightfile"
@@ -927,9 +927,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Pl"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pl"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pl"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -943,9 +943,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Pt"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pt"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -959,9 +959,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Pt_Pt"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-pt"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-pt"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -975,9 +975,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Ro"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ro"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ro"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -991,9 +991,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Ru"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ru"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ru"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1007,9 +1007,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Sk"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sk"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sk"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1023,9 +1023,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Sl"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sl"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sl"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1039,9 +1039,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Sr"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sr"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sr"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1055,9 +1055,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Sv"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sv"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sv"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1071,9 +1071,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Sw"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sw"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sw"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1087,9 +1087,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Th"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-th"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-th"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1103,9 +1103,9 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Uk"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-uk"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2009 by Vladimir Yakovchuk, Oleg Podgurniy, Dmytro Kovalyov, Maksym Polyakov, Andriy Rysin, Valentyn Solomko, Volodymyr M. Lisivka, Eugeniy Meshcheryakov"
 solariscopyright = "solariscopyrightfile"
@@ -1119,25 +1119,25 @@ Start
 module = "gid_Module_Root_Extension_Dictionary_Vi"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-vi"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-dict-vi"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-dict-vi"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
 description = "Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Root_Extension_Dictionary_Zu"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-zu"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-zu"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
 linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
@@ -1150,15 +1150,15 @@ End
 
 Start
 module = "gid_Module_Optional_OGLTrans"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ogltrans"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ogltrans"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-ogltrans"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-impress"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ogltrans"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "OpenGL slide transitions module for %PRODUCTNAME %OOOBASEVERSION"
+description = "OpenGL slide transitions module for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
diff --git a/setup_native/source/packinfo/packinfo_office_help.txt b/setup_native/source/packinfo/packinfo_office_help.txt
index 93ff70cf3d9d..d0476b63a503 100755
--- a/setup_native/source/packinfo/packinfo_office_help.txt
+++ b/setup_native/source/packinfo/packinfo_office_help.txt
@@ -18,18 +18,18 @@
 
 Start
 module = "gid_Module_Helppack_Help"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-help"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-help"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Help module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
 End
 
 
diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index 0e2e05c4d6b7..a90beae526ad 100755
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -18,194 +18,194 @@
 
 Start
 module = "gid_Module_Langpack_Basis"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
 End
 
 Start
 module = "gid_Module_Langpack_Fonts"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-fonts"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-fonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-fonts"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-fonts"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Language fonts module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language fonts module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
 End
 
 Start
 module = "gid_Module_Langpack_Resource"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-res"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-res"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Language resource module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language resource module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
 End
 
 Start
 module = "gid_Module_Langpack_Writer"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-writer"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-writer"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Writer language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Writer language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-writer"
 End
 
 Start
 module = "gid_Module_Langpack_Calc"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-calc"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-calc"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Calc language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Calc language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-calc"
 End
 
 Start
 module = "gid_Module_Langpack_Impress"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-impress"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-impress"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-impress"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Impress language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Impress language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-impress"
 End
 
 Start
 module = "gid_Module_Langpack_Draw"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-draw"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-draw"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-draw"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Draw language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Draw language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-draw"
 End
 
 Start
 module = "gid_Module_Langpack_Math"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-math"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-math"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Math language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Math language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-math"
 End
 
 Start
 module = "gid_Module_Langpack_Base"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-base"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-base"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Base language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Base language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-base"
 End
 
 Start
 module = "gid_Module_Langpack_Onlineupdate"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-onlineupd"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-onlineupd"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-onlineupd"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-onlineupd"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Online update language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Online update language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-onlineupdate"
 End
 
 Start
 module = "gid_Module_Optional_Extensions_Sun_T_Pack"
 script = "shellscripts_extensions.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-sun-templates-pack-%LANGUAGESTRING"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
 description = "SUN Template Pack (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 Start
 module = "gid_Module_Optional_Extensions_LightProof_M"
 script = "shellscripts_extensions.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-lightproof-%LANGUAGESTRING"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-lightproof-%LANGUAGESTRING"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-extension-lightproof-%LANGUAGESTRING"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-lightproof-%LANGUAGESTRING"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
 description = "Lightproof (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 # Language depended package definitions for OxygenOffice Professional
@@ -214,68 +214,68 @@ End
 
 Start
 module = "gid_Module_Optional_Accessories_Tem"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-templates"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-templates"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-templates"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-templates"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-extra-templates"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-templates"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2008 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Extra templates for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 # 2/4 Samples
 
 Start
 module = "gid_Module_Optional_Accessories_Sam"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-samples"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-samples"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-samples"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-samples"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-extra-samples"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-samples"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2008 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Extra samples for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 # 3/4 Documentations
 
 Start
 module = "gid_Module_Optional_Accessories_Doc"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-documentations"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-documentations"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-extra-documentations"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-documentations"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2008 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Extra documentations for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 # 4/4 Advertisement
 
 Start
 module = "gid_Module_Optional_Accessories_Adv"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-extra-advertisement"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-advertisement"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-extra-advertisement"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-extra-advertisement"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2008 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
 description = "Extra advertisement for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
 # END OF Language depended package definitions
diff --git a/setup_native/source/packinfo/packinfo_sdkoo.txt b/setup_native/source/packinfo/packinfo_sdkoo.txt
index 3e3e1d579fad..58d6bc834cbb 100755
--- a/setup_native/source/packinfo/packinfo_sdkoo.txt
+++ b/setup_native/source/packinfo/packinfo_sdkoo.txt
@@ -27,15 +27,15 @@
 
 Start
 module = "gid_Module_Root_SDK"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-sdk"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-sdk"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-sdk"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-sdk"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org Community"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Software Development Kit for LibreOffice %OOOBASEVERSION"
+description = "Software Development Kit for LibreOffice %PRODUCTVERSION"
 destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
+packageversion = "%ABOUTBOXPRODUCTVERSION"
 End