[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.2_rc1-1-37-ge2ede8b



The following commit has been merged in the debian-experimental-3.6 branch:
commit 8417728ec35171fa57d1c66af627166290e615ed
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Oct 12 13:01:59 2012 +0200

    add patch from Dave Steele to make senddoc.sh default to standard mailto handler

diff --git a/changelog b/changelog
index ef224c1..3e775d4 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:3.6.3~rc1-1) UNRELEASED; urgency=low
   * new upstream release candidate
 
   [ Rene Engelhard ]
+  * debian/patches/sensible-lomua.diff: add patch from Dave Steele to
+    make senddoc.sh default to standard mailto handler (closes: #687228)
+
   * debian/rules:
     - try again with gcc 4.6 for mips* since apparently testtools/smoketest
       now work..
diff --git a/patches/sensible-lomua.diff b/patches/sensible-lomua.diff
index 0aec8b0..c4a60cb 100644
--- a/patches/sensible-lomua.diff
+++ b/patches/sensible-lomua.diff
@@ -1,8 +1,8 @@
-Index: logit/officecfg/registry/data/org/openoffice/Office/Common.xcu
+Index: libreoffice-3.6.2~rc1/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 @@
+--- libreoffice-3.6.2~rc1.orig/officecfg/registry/data/org/openoffice/Office/Common.xcu	2012-10-07 21:03:17.662850386 -0400
++++ libreoffice-3.6.2~rc1/officecfg/registry/data/org/openoffice/Office/Common.xcu	2012-10-07 21:03:57.174850591 -0400
+@@ -665,8 +665,7 @@
    </node>
    <node oor:name="ExternalMailer" install:module="unixdesktop">
      <prop oor:name="Program">
@@ -12,17 +12,22 @@ Index: logit/officecfg/registry/data/org/openoffice/Office/Common.xcu
      </prop>
    </node>
    <node oor:name="Font">
-Index: logit/shell/source/unix/misc/senddoc.sh
+Index: libreoffice-3.6.2~rc1/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 @@
+--- 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 @@
      shift
  fi
  
 +case `basename "$MAILER"` in
 +    sensible-lomua)
-+        if [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/evolution ]; then
++        if [ -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
++            MAILER=undefined
++        elif [ -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

-- 
LibreOffice packaging repository


Reply to: