[Libreoffice-commits] .: patches/dev300

[Michael Meeks]

 patches/dev300/apply                                     |   12 ------
 patches/dev300/office-cfg-common-template-dir.diff       |   29 ---------------
 patches/dev300/office-cfg-linux-common-template-dir.diff |    6 +--
 3 files changed, 3 insertions(+), 44 deletions(-)

New commits:
commit ba3de1c16542fd554477a7cb0047b163e4d5a702
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Dec 8 15:49:45 2010 +0000

    remove merged common templates patch, and fix linux paths

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 544d70f..8378f2e 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -711,18 +711,6 @@ writer-default-as-optimal-page-wrap.diff, i#38108, jody
 # Use the Gnome VFS on KDE as well if it's there (better than nothing)
 vfs-kde-too.diff, michael
 
-[ Win32Only ]
-# search <ooo-home>/share/template/common for language independent templates
-# will not push it upstream because it will be replaced by upcomming kendy's work
-
-# FIXME dev300-m77: doesn't apply at all
-# office-cfg-common-template-dir.diff, pmladek
-
-[ MacOSXOnly ]
-# search <ooo-home>/share/template/common for language independent templates
-# will not push it upstream because it will be replaced by upcomming kendy's work
-office-cfg-common-template-dir.diff, pmladek
-
 [ LinuxOnly ]
 # search <ooo-home>/share/template/common for language independent templates
 # will not push it upstream because it will be replaced by upcomming kendy's work
diff --git a/patches/dev300/office-cfg-common-template-dir.diff b/patches/dev300/office-cfg-common-template-dir.diff
deleted file mode 100644
index 8e723fb..0000000
--- a/patches/dev300/office-cfg-common-template-dir.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old	2007-08-23 20:15:04.000000000 +0200
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2007-08-24 16:15:30.000000000 +0200
-@@ -1524,7 +1524,7 @@ Dymamic border coloring means that when 
- 						<author>MBA</author>
- 						<desc>Specifies the templates originate from these folders and sub-folders.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
-+                    <value oor:separator=";">$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
- 				</prop>
- 				<prop oor:name="UIConfig" oor:type="oor:string-list">
- 					<info>
-@@ -1672,7 +1672,7 @@ Dymamic border coloring means that when 
- 					<info>
- 						<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
-+                    <value oor:separator=";">$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
- 				</prop>
- 				<prop oor:name="UIConfig" oor:type="oor:string-list">
- 					<info>
---- officecfg/registry/data/org/openoffice/Office/Common.xcu.old	2007-08-23 20:15:03.000000000 +0200
-+++ officecfg/registry/data/org/openoffice/Office/Common.xcu	2007-08-24 16:18:32.000000000 +0200
-@@ -536,4 +536,6 @@
-       </prop>
-     </node>
-   </node>
-+  <!-- FIXME: This comment is needed to change a checksum or so.
-+              Then the updated list of templates paths is read from Common.xcs-->
- </oor:component-data>
diff --git a/patches/dev300/office-cfg-linux-common-template-dir.diff b/patches/dev300/office-cfg-linux-common-template-dir.diff
index e81f789..34cf86b 100644
--- a/patches/dev300/office-cfg-linux-common-template-dir.diff
+++ b/patches/dev300/office-cfg-linux-common-template-dir.diff
@@ -22,16 +22,16 @@ index 74c65d3..4e43df8 100644
  						<author>MBA</author>
  						<desc>Specifies the templates originate from these folders and sub-folders.</desc>
  					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
+-					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value>
 +                    <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>
-@@ -1837,7 +1837,7 @@
+@@ -1837,8 +1837,7 @@
  					<info>
  						<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
  					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
+-					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value>
 +                    <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">