The following commit has been merged in the debian-experimental-3.5 branch:
commit 34c8ceecd6d3efce8ca6a3c213e99603f4ef623f
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Nov 24 17:50:06 2011 +0100
migrate sensible-browser.diff from libreoffice/build
diff --git a/changelog b/changelog
index 77346eb..aebf26c 100644
--- a/changelog
+++ b/changelog
@@ -36,8 +36,9 @@ libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED;
urgency=low
* migrate sensible-ooomua.diff from libreoffice/build
* rename sensible-ooomua to sensible-lomua
* add icedove and thunderbird as fallbacks
+ * migrate sensible-browser.diff from libreoffice/build
- -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 24 Nov 2011
17:33:48 +0100
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 24 Nov 2011
17:48:42 +0100
libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
diff --git a/patches/sensible-browser.diff b/patches/sensible-browser.diff
new file mode 100644
index 0000000..4c43a38
--- /dev/null
+++ b/patches/sensible-browser.diff
@@ -0,0 +1,32 @@
+Index: logit/shell/source/unix/misc/gnome-open-url.sh
+===================================================================
+--- logit.orig/shell/source/unix/misc/gnome-open-url.sh 2011-11-22
20:57:46.000000000 +0000
++++ logit/shell/source/unix/misc/gnome-open-url.sh 2011-11-24
16:47:51.199972037 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+
+ # use xdg-open or gnome-open if available
+-xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || "$0.bin" $1
++xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || sensible-browser
"$1" || "$0.bin" $1
+
+ exit 0
+Index: logit/shell/source/unix/misc/kde-open-url.sh
+===================================================================
+--- logit.orig/shell/source/unix/misc/kde-open-url.sh 2011-11-22
20:57:46.000000000 +0000
++++ logit/shell/source/unix/misc/kde-open-url.sh 2011-11-24
16:47:51.199972037 +0000
+@@ -2,9 +2,13 @@
+
+ # special handling for mailto: uris
+ if echo $1 | grep '^mailto:' > /dev/null; then
+- kmailservice "$1" &
++ if which kde-open; then
++ kde-open "$1" &
++ else
++ mailservice "$1" &
++ fi
+ else
+- kfmclient openURL "$1" &
++ sensible-browser "$1" &
+ fi
+
+ exit 0
diff --git a/patches/series b/patches/series
index bcacf67..3ef96cf 100644
--- a/patches/series
+++ b/patches/series
@@ -17,3 +17,4 @@ getMIMEDescription-mismatch.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
+sensible-browser.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rtcvx-0005pc...@vasks.debian.org
