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

[René Engelhard]

 patches/dev300/apply                              |    9 ++++++---
 patches/dev300/ark-default-ExternalMailer.diff    |   18 ++++++++----------
 patches/dev300/pardus-default-ExternalMailer.diff |   18 ++++++++----------
 patches/dev300/sensible-ooomua.diff               |   16 ++++++++--------
 4 files changed, 30 insertions(+), 31 deletions(-)

New commits:
commit 4c292c8e0105575ce5d94939a270bbe0f549a460
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jul 6 17:11:02 2010 +0200

    fix and re-enabling patches changing ExternalMailer
    
    * patches/dev300/apply:
    * patches/dev300/ark-default-ExternalMailer.diff:
    * patches/dev300/pardus-default-ExternalMailer.diff:
    * patches/dev300/sensible-ooomua.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d4d5172..e4613ed 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -396,6 +396,9 @@ slideshow-effect-rewind-sdext.diff, i#48179, thorsten
 # correctly set table row height during ppt import
 svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
 
+# ignore spurious <prop> elements in .xcu set nodes
+configmgr-ignore-spurious-pops.diff, i#110720
+
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
@@ -1239,7 +1242,7 @@ sfx2-template-category-labels.diff, pmladek
 scp2_add_additional_dirs.diff, kami
 
 [ DebianBaseOnly ]
-# FIXME dev300-m77 sensible-ooomua.diff
+sensible-ooomua.diff
 sensible-browser.diff
 
 [ BuildBits ]
@@ -2150,7 +2153,7 @@ SectionOwner => brosenk
 
 # We use KMail...
 # There's no point in upstreaming this because not everyone uses KMail.
-# FIXME dev300-m77 ark-default-ExternalMailer.diff
+ark-default-ExternalMailer.diff
 
 [ ArkOnlyExperimental ]
 # There's no point in upstreaming this because it relies on the Ark
@@ -2341,7 +2344,7 @@ sfx2-global-scope-fix.diff, thorsten
 cws-kohei03-sc-macfix.diff, thorsten
 
 [ PardusOnly ]
-# FIXME dev300-m77 pardus-default-ExternalMailer.diff
+pardus-default-ExternalMailer.diff
 pardus-clipart.diff
 dont-check-fqdn.diff
 
diff --git a/patches/dev300/ark-default-ExternalMailer.diff b/patches/dev300/ark-default-ExternalMailer.diff
index cb74859..1b1e7ba 100644
--- a/patches/dev300/ark-default-ExternalMailer.diff
+++ b/patches/dev300/ark-default-ExternalMailer.diff
@@ -1,14 +1,12 @@
 --- officecfg/registry/data/org/openoffice/Office/Common.xcu.ark	2007-10-19 12:01:42.000000000 +0200
 +++ officecfg/registry/data/org/openoffice/Office/Common.xcu	2007-10-19 12:04:52.000000000 +0200
-@@ -536,6 +536,11 @@
-       </prop>
-     </node>
+@@ -651,8 +651,7 @@
    </node>
-+  <node oor:name="ExternalMailer">
-+    <prop oor:name="Program" oor:type="xs:string">
+   <node oor:name="ExternalMailer" install:module="unixdesktop">
+     <prop oor:name="Program">
+-      <value oor:external=
+-          "com.sun.star.configuration.backend.DesktopBackend ExternalMailer"/>
 +      <value>/usr/bin/kmail</value>
-+    </prop>
-+  </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>
+     </prop>
+   </node>
+   <node oor:name="Font">
diff --git a/patches/dev300/pardus-default-ExternalMailer.diff b/patches/dev300/pardus-default-ExternalMailer.diff
index 74775fe..7f5d77e 100644
--- a/patches/dev300/pardus-default-ExternalMailer.diff
+++ b/patches/dev300/pardus-default-ExternalMailer.diff
@@ -1,14 +1,12 @@
 --- officecfg/registry/data/org/openoffice/Office/Common.xcu.ark	2006-03-12 03:53:26.000000000 +0000
 +++ officecfg/registry/data/org/openoffice/Office/Common.xcu	2006-03-12 03:59:16.000000000 +0000
-@@ -536,6 +536,11 @@
-       </prop>
-     </node>
+@@ -651,8 +651,7 @@
    </node>
-+  <node oor:name="ExternalMailer">
-+    <prop oor:name="Program" oor:type="xs:string">
+   <node oor:name="ExternalMailer" install:module="unixdesktop">
+     <prop oor:name="Program">
+-      <value oor:external=
+-          "com.sun.star.configuration.backend.DesktopBackend ExternalMailer"/>
 +      <value>/usr/kde/3.5/bin/kmail</value>
-+    </prop>
-+  </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>
+     </prop>
+   </node>
+   <node oor:name="Font">
diff --git a/patches/dev300/sensible-ooomua.diff b/patches/dev300/sensible-ooomua.diff
index 07ee9e4..0023884 100644
--- a/patches/dev300/sensible-ooomua.diff
+++ b/patches/dev300/sensible-ooomua.diff
@@ -5,16 +5,16 @@ retrieving revision 1.31
 diff -u -u -r1.31 Common.xcu
 --- officecfg/registry/data/org/openoffice/Office/Common.xcu	23 Mar 2005 10:53:46 -0000	1.31
 +++ officecfg/registry/data/org/openoffice/Office/Common.xcu	25 May 2005 23:23:30 -0000
-@@ -576,4 +576,9 @@
+@@ -651,8 +651,7 @@
    </node>
-   <!-- FIXME: This comment is needed to change a checksum or so.
-               Then the updated list of templates paths is read from Common.xcs-->
-+  <node oor:name="ExternalMailer">
-+    <prop oor:name="Program" oor:type="xs:string">
+   <node oor:name="ExternalMailer" install:module="unixdesktop">
+     <prop oor:name="Program">
+-      <value oor:external=
+-          "com.sun.star.configuration.backend.DesktopBackend ExternalMailer"/>
 +      <value>sensible-ooomua</value>
-+    </prop>
-+  </node>
- </oor:component-data>
+     </prop>
+   </node>
+   <node oor:name="Font">
 Index: shell/source/unix/misc/senddoc.sh
 ===================================================================
 RCS file: /cvs/gsl/shell/source/unix/misc/senddoc.sh,v