You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/05/30 06:54:50 UTC
svn commit: r1487730 - in
/openoffice/trunk/main/setup_native/source/packinfo: package_names.txt
packinfo_brand.txt packinfo_office.txt packinfo_office_lang.txt
Author: arielch
Date: Thu May 30 04:54:49 2013
New Revision: 1487730
URL: http://svn.apache.org/r1487730
Log:
i121968 - Obsolete binfilter
Modified:
openoffice/trunk/main/setup_native/source/packinfo/package_names.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_brand.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.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=1487730&r1=1487729&r2=1487730&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:54:49 2013
@@ -1,6 +1,5 @@
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
@@ -12,7 +11,6 @@
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for %APACHEPROJECTNAME%OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
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=1487730&r1=1487729&r2=1487730&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:54:49 2013
@@ -29,7 +29,8 @@ packagename = "%UNIXPACKAGENAME"
# ooobasis3.*-oooimprovement
# ooobasis3.*-kde-integration
# openoffice.org3-dict-en|es|fr (installed by OOo 3.3.0)
-linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration"
+# ooobasis3.*-binfilter
+linuxreplaces = "openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter"
requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX-core01,%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISPACKAGEPREFIX-core04,%BASISPACKAGEPREFIX-core05,%BASISPACKAGEPREFIX-core06,%BASISPACKAGEPREFIX-core07,%BASISPACKAGEPREFIX-images"
solarisrequires = "%SOLSUREPACKAGEPREFIX-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")"
copyright = "2012 by The Apache Software Foundation"
@@ -134,7 +135,8 @@ Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING"
packagename = "%UNIXPACKAGENAME-%LANGUAGESTRING"
-linuxreplaces = "openoffice.org3-%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"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%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-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKA
GEPREFIX%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")"
copyright = "2012 by The Apache Software Foundation"
Modified: openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt?rev=1487730&r1=1487729&r2=1487730&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt Thu May 30 04:54:49 2013
@@ -189,21 +189,6 @@ destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
-Start
-module = "gid_Module_Optional_Binfilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05"
-packagename = "%BASISPACKAGEPREFIX-binfilter"
-linuxreplaces = "ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX-core01"
-requires = "%BASISPACKAGEPREFIX-core01"
-copyright = "2012 by The Apache Software Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-End
Start
module = "gid_Module_Optional_Grfflt"
Modified: openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt?rev=1487730&r1=1487729&r2=1487730&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt Thu May 30 04:54:49 2013
@@ -208,23 +208,6 @@ pkg_list_entry = "%BASISPACKAGEPREFIX%WI
End
Start
-module = "gid_Module_Langpack_Binfilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-binfilter"
-linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-binfilter,ooobasis3.1-%LANGUAGESTRING-binfilter,ooobasis3.2-%LANGUAGESTRING-binfilter,ooobasis3.3-%LANGUAGESTRING-binfilter,ooobasis3.4-%LANGUAGESTRING-binfilter"
-provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-binfilter"
-requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
-copyright = "2012 by The Apache Software Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
-End
-
-Start
module = "gid_Module_Langpack_Onlineupdate"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"