GNOME.org
 

ooo-build r13309 - in trunk: . patches/dev300

Author: szalaik
Date: Sat Jul 19 06:07:27 2008
New Revision: 13309
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13309&view=rev

Log:
2008-07-19  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/accessories_build.diff
	* patches/dev300/extensions_packinfo.diff
	* patches/dev300/scp2_accessories.diff
	Adjusting installation/build scripts in OxygenOffice.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/accessories_build.diff
   trunk/patches/dev300/extensions_packinfo.diff
   trunk/patches/dev300/scp2_accessories.diff

Modified: trunk/patches/dev300/accessories_build.diff
==============================================================================
--- trunk/patches/dev300/accessories_build.diff	(original)
+++ trunk/patches/dev300/accessories_build.diff	Sat Jul 19 06:07:27 2008
@@ -1,6 +1,6 @@
 --- extras/prj/build.lst.eredeti	2006-12-01 15:23:25.000000000 +0100
 +++ extras/prj/build.lst	2007-12-24 14:50:16.000000000 +0100
-@@ -13,6 +13,51 @@
+@@ -13,6 +13,62 @@
  er      extras\source\gallery\sounds                            nmake   -       all     er_gsnds NULL
  er      extras\source\gallery\www-back                          nmake   -       all     er_gwbck NULL
  er      extras\source\gallery\www-graf                          nmake   -       all     er_gwgrf NULL
@@ -30,6 +30,17 @@
 +er      extras\source\premium\templates\offimisc\lang           nmake   -       all     er_prteom NULL
 +er      extras\source\premium\templates\personal\lang           nmake   -       all     er_prtepe NULL
 +er      extras\source\premium\templates\lang                    nmake   -       all     er_prtemp NULL
++er      extras\source\premium\templates\common\layout             nmake   -       all     er_prtecola NULL
++er      extras\source\premium\templates\common\presnt             nmake   -       all     er_prtecopr NULL
++er      extras\source\premium\templates\common\educate            nmake   -       all     er_prtecoed NULL
++er      extras\source\premium\templates\common\finance            nmake   -       all     er_prtecofi NULL
++er      extras\source\premium\templates\common\forms              nmake   -       all     er_prtecofo NULL
++er      extras\source\premium\templates\common\labels             nmake   -       all     er_prtecolb NULL
++er      extras\source\premium\templates\common\misc               nmake   -       all     er_prtecomi NULL
++er      extras\source\premium\templates\common\officorr           nmake   -       all     er_prtecooc NULL
++er      extras\source\premium\templates\common\offimisc           nmake   -       all     er_prtecoom NULL
++er      extras\source\premium\templates\common\personal           nmake   -       all     er_prtecope NULL
++er      extras\source\premium\templates\common                    nmake   -       all     er_prtecomp NULL
 +er      extras\source\premium\samples\advertisement\lang        nmake   -       all     er_prsaad NULL
 +er      extras\source\premium\samples\documentation\lang        nmake   -       all     er_prsedo NULL
 +er      extras\source\premium\samples\lang                      nmake   -       all     er_prsamp NULL

Modified: trunk/patches/dev300/extensions_packinfo.diff
==============================================================================
--- trunk/patches/dev300/extensions_packinfo.diff	(original)
+++ trunk/patches/dev300/extensions_packinfo.diff	Sat Jul 19 06:07:27 2008
@@ -7,11 +7,11 @@
 +module = "gid_Module_Optional_Extensions_SDEXT"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extension-presentation-minimizer"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core08 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
 +packagename = "%UNIXPRODUCTNAME-extension-presentation-minimizer"
 +linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extension-presentation-minimizer"
-+requires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 +copyright = "1999-2008 by OpenOffice.org"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "OpenOffice.org"
@@ -24,11 +24,11 @@
 +module = "gid_Module_Optional_Extensions_REPORTDESIGN"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extension-report-builder"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core08 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
 +packagename = "%UNIXPRODUCTNAME-extension-report-builder"
 +linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extension-report-builder"
-+requires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 +copyright = "1999-2008 by OpenOffice.org"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "OpenOffice.org"

Modified: trunk/patches/dev300/scp2_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_accessories.diff	Sat Jul 19 06:07:27 2008
@@ -1195,7 +1195,7 @@
 +    EXTRA_ALL_LANG(kamitemplatespersonal);
 +End
 +
-+/* ** Templates - Common** */
++/* ** Templates - Common ** */
 +
 +File gid_File_Extra_Templates_Common
 +    Dir = gid_Dir_Template_Common;
@@ -1208,70 +1208,70 @@
 +    Dir = gid_Dir_Template_Common_Layout;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonlayout";
++    Name = "kamitemplatescommonlayout.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Present
 +    Dir = gid_Dir_Template_Common_Presnt;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonpresent";
++    Name = "kamitemplatescommonpresent.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Educate
 +    Dir = gid_Dir_Template_Common_Educate;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommoneducate";
++    Name = "kamitemplatescommoneducate.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Finance
 +    Dir = gid_Dir_Template_Common_Finance;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonfinance";
++    Name = "kamitemplatescommonfinance.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Forms
 +    Dir = gid_Dir_Template_Common_Forms;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonforms";
++    Name = "kamitemplatescommonforms.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Labels
 +    Dir = gid_Dir_Template_Common_Labels;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonlabels";
++    Name = "kamitemplatescommonlabels.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Misc
 +    Dir = gid_Dir_Template_Common_Misc;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonmisc";
++    Name = "kamitemplatescommonmisc.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Officorr
 +    Dir = gid_Dir_Template_Common_Officorr;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonofficorr";
++    Name = "kamitemplatescommonofficorr.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Offimisc
 +    Dir = gid_Dir_Template_Common_Offimisc;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonoffimisc";
++    Name = "kamitemplatescommonoffimisc.zip";
 +End
 +
 +File gid_File_Extra_Templates_Common_Personal
 +    Dir = gid_Dir_Template_Common_Personal;
 +    TXT_FILE_BODY;
 +    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    Name = "kamitemplatescommonpersonal";
++    Name = "kamitemplatescommonpersonal.zip";
 +End
 +
 +/* ** Templates - NON FREE ** */
@@ -1889,7 +1889,7 @@
 diff -Naur scp2/source/accessories/module_samples_accessories.scp scp2/source/accessories/module_samples_accessories.scp
 --- scp2/source/accessories/module_samples_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_samples_accessories.scp	2008-03-23 15:19:17.000000000 +0100
-@@ -0,0 +1,81 @@
+@@ -0,0 +1,77 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1947,9 +1947,7 @@
 +    Description = "gid_Module_Optional_Accessories_Documentations_Template";
 +    Styles = (TEMPLATEMODULE);
 +    Files = (  
-+        gid_File_Extra_Samples_KAMI,
 +        gid_File_Extra_Samples_Documentations_KAMI,
-+        gid_File_Extra_Samples_NONFREE_KAMI,
 +        gid_File_Extra_Samples_NONFREE_Documentations_KAMI );
 +    Minimal = NO;
 +    Default = YES;
@@ -1961,9 +1959,7 @@
 +    Description = "gid_Module_Optional_Accessories_Advertisement_Template";
 +    Styles = (TEMPLATEMODULE);
 +    Files = ( 
-+        gid_File_Extra_Samples_KAMI,
 +        gid_File_Extra_Samples_Advertisement_KAMI,
-+        gid_File_Extra_Samples_NONFREE_KAMI,
 +        gid_File_Extra_Samples_NONFREE_Advertisement_KAMI );
 +    Minimal = NO;
 +    Default = YES;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]