ooo-build r14136 - in branches/ooo-build-3-0: . distro-configs patches/scsolver

[strba svn gnome org]

Author: strba
Date: Mon Sep 29 08:22:01 2008
New Revision: 14136
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14136&view=rev

Log:
some scsolver packaging + --with-fonts for GoOoLinux

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/distro-configs/GoOoLinux.conf.in
   branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff
   branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff

Modified: branches/ooo-build-3-0/distro-configs/GoOoLinux.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/GoOoLinux.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/GoOoLinux.conf.in	Mon Sep 29 08:22:01 2008
@@ -34,4 +34,5 @@
 --without-system-xrender-headers
 --without-system-mesa-headers
 --without-unix-wrapper
+--with-fonts
 

Modified: branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff
==============================================================================
--- branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff	(original)
+++ branches/ooo-build-3-0/patches/scsolver/scsolver-scp2.diff	Mon Sep 29 08:22:01 2008
@@ -18,15 +18,12 @@
 @@ -0,0 +1,8 @@
 +#include "macros.inc"
 +
-+File gid_File_Oxt_ScSolver
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
++File gid_File_Extension_ScSolver
 +    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name = STRING(scsolver.uno.oxt);
++    Name = "scsolver.uno.oxt";
++    Styles = (PACKED);
++    UnixRights = 444;
 +End
-diff --git scp2/source/scsolver/makefile.mk scp2/source/scsolver/makefile.mk
-new file mode 100644
-index 0000000..7f6b86e
 --- /dev/null
 +++ scp2/source/scsolver/makefile.mk
 @@ -0,0 +1,62 @@
@@ -97,17 +94,16 @@
 index 0000000..ac9b7d3
 --- /dev/null
 +++ scp2/source/scsolver/module_scsolver.scp
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,10 @@
 +#include "macros.inc"
 +
-+Module gid_Module_Optional_ScSolver
++Module gid_Module_Root_Extension_ScSolver
++    MOD_NAME_DESC(MODULE_ROOT_EXTENSION_SCSOLVER);
++    Files = (gid_File_Extension_ScSolver);
++    InstallOrder = "2000";
 +    PackageInfo = "packinfo_office.txt";
-+    MOD_NAME_DESC ( MODULE_OPTIONAL_SCSOLVER );
-+    ParentID = gid_Module_Optional;
-+    Sortkey = "750";
-+    Files = (gid_File_Oxt_ScSolver);
-+    Minimal = NO;
-+    Default = YES;
++    ParentID = gid_Module_Root;
++    Styles = (HIDDEN_ROOT);
 +End
 diff --git scp2/source/scsolver/module_scsolver.ulf scp2/source/scsolver/module_scsolver.ulf
 new file mode 100644
@@ -116,10 +112,10 @@
 +++ scp2/source/scsolver/module_scsolver.ulf
 @@ -0,0 +1,6 @@
 +
-+[STR_NAME_MODULE_OPTIONAL_SCSOLVER]
++[STR_NAME_MODULE_ROOT_EXTENSION_SCSOLVER]
 +en-US = "%PRODUCTNAME Calc Solver"
 +
-+[STR_DESC_MODULE_OPTIONAL_SCSOLVER]
++[STR_DESC_MODULE_ROOT_EXTENSION_SCSOLVER]
 +en-US = "The linear and non-linear optimization solver for Calc."
 diff --git scp2/util/makefile.mk scp2/util/makefile.mk
 index 329a03a..42eac10 100644

Modified: branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff
==============================================================================
--- branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff	(original)
+++ branches/ooo-build-3-0/patches/scsolver/scsolver-setup_native.diff	Mon Sep 29 08:22:01 2008
@@ -7,14 +7,14 @@
  End
  
 +Start
-+module = "gid_Module_Optional_ScSolver"
++module = "gid_Module_Root_Extension_ScSolver"
 +script = "shellscripts_extensions.txt"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-scsolver"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
-+packagename = "%UNIXPRODUCTNAME-scsolver"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-scsolver"
-+requires = "%UNIXPRODUCTNAME-calc"
-+freebsdrequires = "%UNIXPRODUCTNAME-calc"
++solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-scsolver"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
++packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-scsolver"
++linuxreplaces = "%BASISPACKAGEPREFIX%OOOBASEVERSION-scsolver"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
++freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc"
 +copyright = "2005-2008 by Kohei Yoshida"
 +solariscopyright = "solariscopyrightfile"
 +vendor = "OpenOffice.org"