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

[rodo svn gnome org]

Author: rodo
Date: Wed Sep  3 11:30:08 2008
New Revision: 13765
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13765&view=rev

Log:
2008-09-03  Radek Doulik  <rodo novell com>

	* patches/dev300/apply: removed: "#FIXME src680: in
	store-install.diff, instsetoo_native part was commented out"
	comment as the part which had to be patched doesn't exist anymore

	* udkapi/util/makefile.mk: use -i flag so that we use V2 format
	for types.rdb as well. change is located in store-install.diff




Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/store-install.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Sep  3 11:30:08 2008
@@ -2002,7 +2002,6 @@
 SectionOwner => rodo
 SectionIssue => i#75399
 store-core.diff
-#FIXME src680: in store-install.diff, instsetoo_native part was commented out
 store-install.diff
 
 store-registry.diff

Modified: trunk/patches/dev300/store-install.diff
==============================================================================
--- trunk/patches/dev300/store-install.diff	(original)
+++ trunk/patches/dev300/store-install.diff	Wed Sep  3 11:30:08 2008
@@ -105,3 +105,15 @@
 -
 +REGMERGEFLAGS=-i
  .INCLUDE :  target.mk
+diff -rup udkapi-orig/util/makefile.mk udkapi/util/makefile.mk
+--- udkapi-orig/util/makefile.mk        2008-09-03 13:23:25.000000000 +0200
++++ udkapi/util/makefile.mk     2008-09-03 13:21:01.000000000 +0200
+@@ -72,6 +72,8 @@ UNOIDLDBFILES= \
+        $(UCR)$/csstask.db \
+     $(UCR)$/cssuri.db
+ 
++REGMERGEFLAGS=-i
++
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE :  target.mk