[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/apply                     |    1 +
 patches/dev300/filter-fix-fcfgmerge.diff |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 900a369e29d20df03cc0c5fb0eee8d04521b476a
Author: Radek Doulik <rodo at novell.com>
Date:   Tue May 25 13:32:15 2010 +0200

    fix fcfgmerge config path
    
    * patches/dev300/apply:
    * patches/dev300/filter-fix-fcfgmerge.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a5b9b10..94540fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3762,3 +3762,4 @@ transogl-transitions-newsflash-pptin.diff
 
 [ Fixes ]
 oox-build-fix-dev300-m77.diff, kohei
+filter-fix-fcfgmerge.diff, rodo
diff --git a/patches/dev300/filter-fix-fcfgmerge.diff b/patches/dev300/filter-fix-fcfgmerge.diff
new file mode 100644
index 0000000..5574a10
--- /dev/null
+++ b/patches/dev300/filter-fix-fcfgmerge.diff
@@ -0,0 +1,12 @@
+diff -rup filter-orig/source/config/tools/merge/pyAltFCFGMerge filter/source/config/tools/merge/pyAltFCFGMerge
+--- filter-orig/source/config/tools/merge/pyAltFCFGMerge	2010-05-25 11:47:25.000000000 +0200
++++ filter/source/config/tools/merge/pyAltFCFGMerge	2010-05-25 11:50:06.000000000 +0200
+@@ -11,7 +11,7 @@
+ 
+ import sys, string, os.path
+ 
+-CFGFILE = "../../../../transex3/source/filter/merge/FCFGMerge.cfg"
++CFGFILE = "../../../source/config/tools/merge/FCFGMerge.cfg"
+ 
+ PROP_XMLVERSION      = "xmlversion"               # // <= global cfg file
+ PROP_XMLENCODING     = "xmlencoding"              # // <= global cfg file