[libreoffice] 01/01: sync upstreams "add xdg-email as the default email route" into sensible-lomua.diff

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 5c0436f4b3ed4509c9c5b1aee54f38605b794248
Author: Rene Engelhard <rene at debian.org>
Date:   Sat May 27 12:43:59 2017 +0200

    sync upstreams "add xdg-email as the default email route" into sensible-lomua.diff
---
 changelog                   | 3 +++
 patches/sensible-lomua.diff | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index af1c19e..ab7e9f5 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
 libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
 
+  * debian/patches/sensible-lomua.diff: sync upstreams
+    "add xdg-email as the default email route" into here
+
   * debian/rules:
     - fix logic error; make -g1 etc work also with noddebs. Build with those
       flags also if building no -dbgsym
diff --git a/patches/sensible-lomua.diff b/patches/sensible-lomua.diff
index 3a54a3a..56123ff 100644
--- a/patches/sensible-lomua.diff
+++ b/patches/sensible-lomua.diff
@@ -15,13 +15,15 @@ Index: libreoffice-3.6.2~rc1/shell/source/unix/misc/senddoc.sh
 ===================================================================
 --- libreoffice-3.6.2~rc1.orig/shell/source/unix/misc/senddoc.sh	2012-10-07 21:03:17.662850386 -0400
 +++ libreoffice-3.6.2~rc1/shell/source/unix/misc/senddoc.sh	2012-10-07 21:29:13.074858447 -0400
-@@ -59,6 +59,30 @@
+@@ -59,6 +59,32 @@
      shift
  fi
  
 +case `basename "$MAILER"` in
 +    sensible-lomua)
-+        if [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] \
++        if [ -x /usr/bin/xdg-email ] ; then
++            MAILER=/usr/bin/xdg-email
++        elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] \
 +           || [ -x /usr/bin/gnome-open ] \
 +           || [ -x /usr/bin/xdg-open ]; then
 +            # use an undefined mailer, to trigger the default handling

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git