[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply                |    1 
 patches/dev300/sensible-ooomua.diff |   44 ------------------------------------
 2 files changed, 45 deletions(-)

New commits:
commit 9238fa2c3543fc8b41533bc5b1a8fdcc338ec887
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 17:37:46 2011 +0100

    remove sensible-ooomua.diff, downstreamed to debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c958f4b..fc3f05f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -353,7 +353,6 @@ reportdesign-mention-package.diff, rengelha
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 
-sensible-ooomua.diff
 sensible-browser.diff
 
 # add JDK paths for MySQL, PostgreSQL, JTDS
diff --git a/patches/dev300/sensible-ooomua.diff b/patches/dev300/sensible-ooomua.diff
deleted file mode 100644
index 0023884..0000000
--- a/patches/dev300/sensible-ooomua.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: Common.xcu
-===================================================================
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
-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
-@@ -651,8 +651,7 @@
-   </node>
-   <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>
-   <node oor:name="Font">
-Index: shell/source/unix/misc/senddoc.sh
-===================================================================
-RCS file: /cvs/gsl/shell/source/unix/misc/senddoc.sh,v
-retrieving revision 1.8
-diff -u -u -r1.8 senddoc.sh
---- shell/source/unix/misc/senddoc.sh	27 Sep 2005 12:55:00 -0000	1.8
-+++ shell/source/unix/misc/senddoc.sh	16 Feb 2006 00:38:29 -0000
-@@ -91,6 +91,19 @@
- 	shift
- fi
- 
-+case `basename "$MAILER"` in
-+    sensible-ooomua)
-+        if [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/evolution ]; then
-+            MAILER=/usr/bin/evolution
-+        elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kmail ]; then
-+            MAILER=/usr/bin/kmail
-+        elif [ -x /usr/bin/evolution ]; then
-+            # default
-+            MAILER=/usr/bin/evolution
-+        fi
-+        ;;
-+esac
-+
- # autodetect mail client from executable name
- case `basename "$MAILER" | sed 's/-.*$//'` in
-