ooo-build r15148 - in branches/ooo-build-3-0: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Sat Jan 24 01:57:07 2009
New Revision: 15148
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15148&view=rev

Log:
2009-01-23  Tor Lillqvist  <tml novell com>

	* patches/dev300/scp2_extensions_templates.diff
	(scp2/source/templates/module_langpack_extensions_root.sct): The
	parent of the gid_Module_Optional_Extensions_Root_<LANGUAGE_>
	modules should be gid_Module_Optional_Extensions and not
	gid_Module_Optional_Extensions_Sun_Template_Pack. Otherwise one
	gets a build error in scp2 when using --with-extension-integration
	but not --with-sun-templates: Parent
	"gid_Module_Optional_Extensions_Sun_Template_Pack" at Module
	"gid_Module_Optional_Extensions_Root_ns" is not defined!



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/scp2_extensions_templates.diff

Modified: branches/ooo-build-3-0/patches/dev300/scp2_extensions_templates.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_extensions_templates.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_extensions_templates.diff	Sat Jan 24 01:57:07 2009
@@ -40,7 +40,7 @@
 +#include "macros.inc"
 +
 +Module gid_Module_Optional_Extensions_Root_<LANGUAGE_>
-+    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
++    ParentID = gid_Module_Optional_Extensions;
 +    Sortkey = "<SORTKEY>";
 +    Language = "<LANGUAGE>";
 +    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);