ooo-build r12052 - in trunk: . patches/src680

[szalaik svn gnome org]

Author: szalaik
Date: Sat Mar 29 16:58:38 2008
New Revision: 12052
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12052&view=rev

Log:
2008-03-29  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/src680/scp2_makefile_accessories.diff:
	Fix language depended package generation mechanism in
	OxygenOffice.
	* patches/src680/extensions_packinfo.diff: Fix extension
	package names.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/extensions_packinfo.diff
   trunk/patches/src680/scp2_makefile_accessories.diff

Modified: trunk/patches/src680/extensions_packinfo.diff
==============================================================================
--- trunk/patches/src680/extensions_packinfo.diff	(original)
+++ trunk/patches/src680/extensions_packinfo.diff	Sat Mar 29 16:58:38 2008
@@ -6,10 +6,10 @@
  Start
 +module = "gid_Module_Optional_Extensions_SDEXT"
 +script = "shellscripts_extensions.txt"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-presentation-minimizer"
++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")"
-+packagename = "%UNIXPRODUCTNAME-presentation-minimizer"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-presentation-minimizer"
++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"
 +copyright = "1999-2008 by OpenOffice.org"

Modified: trunk/patches/src680/scp2_makefile_accessories.diff
==============================================================================
--- trunk/patches/src680/scp2_makefile_accessories.diff	(original)
+++ trunk/patches/src680/scp2_makefile_accessories.diff	Sat Mar 29 16:58:38 2008
@@ -1,6 +1,6 @@
 --- scp2/util/makefile.mk.orig	2007-08-10 19:15:34.000000000 +0200
 +++ scp2/util/makefile.mk	2007-09-12 15:16:23.177216800 +0200
-@@ -90,7 +90,18 @@
+@@ -90,7 +90,22 @@
               module_python_mailmerge.par   \
               file_python.par               \
               profileitem_python.par        \
@@ -10,7 +10,11 @@
 +             module_font_accessories.par      \
 +             module_gallery_accessories.par   \
 +             module_samples_accessories.par   \
++             module_samples_accessories_langpack.par     \
 +             module_templates_accessories.par \
++	      module_templates_accessories_langpack.par   \
++             module_documentations_accessories_langpack.par     \
++             module_advertisement_accessories_langpack.par     \
 +             file_accessories.par     \
 +             file_font_accessories.par     \
 +             file_gallery_accessories.par  \
@@ -20,7 +24,7 @@
  
  .IF "$(SOLAR_JAVA)"!=""
  SCP1FILES +=                               \
-@@ -223,7 +234,18 @@
+@@ -223,7 +234,22 @@
               module_python.par             \
               module_python_mailmerge.par   \
               file_python.par               \
@@ -30,7 +34,11 @@
 +             module_font_accessories.par      \
 +             module_gallery_accessories.par   \
 +             module_samples_accessories.par   \
++             module_samples_accessories_langpack.par     \
 +             module_templates_accessories.par \
++	      module_templates_accessories_langpack.par   \
++             module_documentations_accessories_langpack.par     \
++             module_advertisement_accessories_langpack.par     \
 +             file_accessories.par     \
 +             file_font_accessories.par     \
 +             file_gallery_accessories.par  \