Author: arielch
Date: Thu May 30 04:55:27 2013
New Revision: 1487736
URL: http://svn.apache.org/r1487736
Log:
i121968 - Prevent package name conflict
Now that all packages have the same base name, the package name has
no version number at all, and there is no more basis packages, the
basis package name colides with the brand package name, for example:
ooobasis3.4-writer is now openoffice-writer
openoffice.org3-writer must be openoffice-brand-writer or the like
Modified:
openoffice/trunk/main/setup_native/source/packinfo/package_names.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt
Modified: openoffice/trunk/main/setup_native/source/packinfo/package_names.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/package_names.txt?rev=1487736&r1=1487735&r2=1487736&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/package_names.txt
(original)
+++ openoffice/trunk/main/setup_native/source/packinfo/package_names.txt Thu
May 30 04:55:27 2013
@@ -62,10 +62,10 @@
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-th Th
dictionary for %PRODUCTNAME %PRODUCTVERSION
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-zu Zu
dictionary for %PRODUCTNAME %PRODUCTVERSION
%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION Brand module for %PRODUCTNAME
%PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING Brand language
module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base Base brand module for
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc Calc brand module for
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw Draw brand module for
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress Impress brand module
for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math Math brand module for
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer Writer brand module for
%PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-%LANGUAGESTRING Brand
language module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-base Base brand
module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-calc Calc brand
module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-draw Draw brand
module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-impress Impress brand
module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-math Math brand
module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-brand-writer Writer brand
module for %PRODUCTNAME %PRODUCTVERSION
Modified: openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt?rev=1487736&r1=1487735&r2=1487736&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt
(original)
+++ openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt Thu
May 30 04:55:27 2013
@@ -44,7 +44,7 @@ End
Start
module = "gid_Module_Brand_Prg_Wrt"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-writer"
-packagename = "%UNIXPACKAGENAME-writer"
+packagename = "%UNIXPACKAGENAME-brand-writer"
linuxreplaces = "openoffice.org3-writer"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-writer"
solarisrequires =
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
@@ -59,7 +59,7 @@ End
Start
module = "gid_Module_Brand_Prg_Calc"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-calc"
-packagename = "%UNIXPACKAGENAME-calc"
+packagename = "%UNIXPACKAGENAME-brand-calc"
linuxreplaces = "openoffice.org3-calc"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-calc"
solarisrequires =
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
@@ -74,7 +74,7 @@ End
Start
module = "gid_Module_Brand_Prg_Impress"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-impress"
-packagename = "%UNIXPACKAGENAME-impress"
+packagename = "%UNIXPACKAGENAME-brand-impress"
linuxreplaces = "openoffice.org3-impress"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-impress"
solarisrequires =
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
@@ -89,7 +89,7 @@ End
Start
module = "gid_Module_Brand_Prg_Draw"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-draw"
-packagename = "%UNIXPACKAGENAME-draw"
+packagename = "%UNIXPACKAGENAME-brand-draw"
linuxreplaces = "openoffice.org3-draw"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-draw"
solarisrequires =
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
@@ -104,7 +104,7 @@ End
Start
module = "gid_Module_Brand_Prg_Math"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-math"
-packagename = "%UNIXPACKAGENAME-math"
+packagename = "%UNIXPACKAGENAME-brand-math"
linuxreplaces = "openoffice.org3-math"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-math"
solarisrequires =
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
@@ -119,7 +119,7 @@ End
Start
module = "gid_Module_Brand_Prg_Base"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-base"
-packagename = "%UNIXPACKAGENAME-base"
+packagename = "%UNIXPACKAGENAME-brand-base"
linuxreplaces = "openoffice.org3-base"
requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-base"
solarisrequires =
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
@@ -134,7 +134,7 @@ End
Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING"
-packagename = "%UNIXPACKAGENAME-%LANGUAGESTRING"
+packagename = "%UNIXPACKAGENAME-brand-%LANGUAGESTRING"
# replace ooobasis3.*-%LANGUAGESTRING-binfilter
linuxreplaces =
"openoffice.org3-%LANGUAGESTRING,ooobasis3.0-%LANGUAGESTRING-binfilter,ooobasis3.1-%LANGUAGESTRING-binfilter,ooobasis3.2-%LANGUAGESTRING-binfilter,ooobasis3.3-%LANGUAGESTRING-binfilter,ooobasis3.4-%LANGUAGESTRING-binfilter,aoobasis3.4.1-%LANGUAGESTRING-binfilter"
requires =
"%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-%LANGUAGESTRING,%BASISPACKAGEPREFIX-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer"
