Typo WITHOUTDOTPACKAGEVERSION -> WITHOUTDOTPRODUCTVERSION.

setup_native/source/packinfo/packinfo_accessories.txt

@@ -21,8 +21,8 @@
 
 Start
 module = "gid_Module_Optional_Accessories_Gallery"
-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"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extra-gallery"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-gallery"
 requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
@@ -38,8 +38,8 @@ End
 
 Start
 module = "gid_Module_Optional_Accessories_Fonts"
-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"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extra-fonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-fonts"
 requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
@@ -55,8 +55,8 @@ End
 
 Start
 module = "gid_Module_Optional_Accessories_Tem_Common"
-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"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extra-templates-common"
+solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-templates-common"
 requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"

setup_native/source/packinfo/packinfo_brand.txt

@@ -30,7 +30,7 @@ module = "gid_Module_Root_Brand"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION"
 packagename = "%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,%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")"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -44,7 +44,7 @@ module = "gid_Module_Brand_Prg_Wrt"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
 requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -58,7 +58,7 @@ module = "gid_Module_Brand_Prg_Calc"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
 requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-calc"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -72,7 +72,7 @@ module = "gid_Module_Brand_Prg_Impress"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
 requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-impress"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -86,7 +86,7 @@ module = "gid_Module_Brand_Prg_Draw"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
 requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-draw"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-draw"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -100,7 +100,7 @@ module = "gid_Module_Brand_Prg_Math"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
 requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-math"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-math"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -114,7 +114,7 @@ module = "gid_Module_Brand_Prg_Base"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
 requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-base"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
@@ -128,7 +128,7 @@ module = "gid_Module_Langpack_Brand"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%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")"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"

setup_native/source/packinfo/packinfo_office_help.txt

@@ -18,10 +18,10 @@
 
 Start
 module = "gid_Module_Helppack_Help"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-help"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-%LANGUAGESTRING-help"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help"
 requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -29,7 +29,7 @@ vendor = "The Document Foundation"
 description = "Help module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING"
 destpath = "/opt"
 packageversion = "%ABOUTBOXPRODUCTVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01"
 End
 
 

setup_native/source/packinfo/packinfo_sdkoo.txt

@@ -27,8 +27,8 @@
 
 Start
 module = "gid_Module_Root_SDK"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-sdk"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-sdk"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-sdk"
 freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"

solenv/bin/modules/installer/epmfile.pm

@@ -1987,7 +1987,7 @@ sub include_languageinfos_into_pkginfo
     else
     {
         # Using default package ooobasis30-core01.
-        my $packagelistentry = "%BASISPACKAGEPREFIX%WITHOUTDOTPACKAGEVERSION-core01";
+        my $packagelistentry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01";
         installer::packagelist::resolve_packagevariables(\$packagelistentry, $variableshashref, 1);
         $newline = "SUNW_PKGLIST=" . $packagelistentry . "\n";
         add_one_line_into_file($changefile, $newline, $filename);