[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-104-gf46462e
The following commit has been merged in the debian-experimental-3.5 branch:
commit f46462ef05860031b5c095d7131af7d4d1e73eb9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Nov 24 17:35:33 2011 +0100
migrate sensible-ooomua.diff from libreoffice/build
* rename sensible-ooomua to sensible-lomua
* add icedove and thunderbird as fallbacks
diff --git a/changelog b/changelog
index cc2729e..77346eb 100644
--- a/changelog
+++ b/changelog
@@ -33,8 +33,11 @@ libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
* migrate help-msg-add-package-info.diff from libreoffice/build
* update help-msg-add-package-info.diff, replace openoffice.org with
libreoffice
+ * migrate sensible-ooomua.diff from libreoffice/build
+ * rename sensible-ooomua to sensible-lomua
+ * add icedove and thunderbird as fallbacks
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 24 Nov 2011 17:05:29 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 24 Nov 2011 17:33:48 +0100
libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
diff --git a/patches/sensible-lomua.diff b/patches/sensible-lomua.diff
new file mode 100644
index 0000000..0aec8b0
--- /dev/null
+++ b/patches/sensible-lomua.diff
@@ -0,0 +1,44 @@
+Index: logit/officecfg/registry/data/org/openoffice/Office/Common.xcu
+===================================================================
+--- logit.orig/officecfg/registry/data/org/openoffice/Office/Common.xcu 2011-11-22 20:57:46.000000000 +0000
++++ logit/officecfg/registry/data/org/openoffice/Office/Common.xcu 2011-11-24 16:31:09.504024867 +0000
+@@ -659,8 +659,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-lomua</value>
+ </prop>
+ </node>
+ <node oor:name="Font">
+Index: logit/shell/source/unix/misc/senddoc.sh
+===================================================================
+--- logit.orig/shell/source/unix/misc/senddoc.sh 2011-11-22 20:57:46.000000000 +0000
++++ logit/shell/source/unix/misc/senddoc.sh 2011-11-24 16:30:30.276027576 +0000
+@@ -59,6 +59,25 @@
+ shift
+ fi
+
++case `basename "$MAILER"` in
++ sensible-lomua)
++ 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
++ elif [ -x /usr/bin/icedove ]; then
++ # fallback
++ MAILER=/usr/bin/icedove
++ elif [ -x /usr/bin/thunderbird ]; then
++ # fallback
++ MAILER=/usr/bin/thunderbird
++ fi
++ ;;
++esac
++
+ # autodetect mail client from executable name
+ case `basename "$MAILER" | sed 's/-.*$//'` in
+
diff --git a/patches/series b/patches/series
index 474556a..bcacf67 100644
--- a/patches/series
+++ b/patches/series
@@ -16,3 +16,4 @@ smoketest-only-en-US.diff
getMIMEDescription-mismatch.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
+sensible-lomua.diff
--
LibreOffice packaging repository
Reply to: