diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-24 17:52:24 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-24 17:52:24 +0100 |
| commit | f193e512bd172132da35284845754ed02855e8e0 (patch) | |
| tree | bf92bf2b115e3512a4e1f15ab4df08c5932b2782 | |
| parent | 9238fa2c3543fc8b41533bc5b1a8fdcc338ec887 (diff) | |
remove sensible-browser.diff, downstreamed to debian-experimental-3.5
| -rw-r--r-- | patches/dev300/apply | 2 | ||||
| -rw-r--r-- | patches/dev300/sensible-browser.diff | 56 |
2 files changed, 0 insertions, 58 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index fc3f05f76..ac7b20588 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -353,8 +353,6 @@ reportdesign-mention-package.diff, rengelha # build using -O2 on x86 and sparc according to Debian policy. debian-opt.diff -sensible-browser.diff - # add JDK paths for MySQL, PostgreSQL, JTDS jdbc-driver-classpaths-debian.diff diff --git a/patches/dev300/sensible-browser.diff b/patches/dev300/sensible-browser.diff deleted file mode 100644 index aeb901f42..000000000 --- a/patches/dev300/sensible-browser.diff +++ /dev/null @@ -1,56 +0,0 @@ -Index: shell/source/unix/misc/gnome-open-url.sh -=================================================================== -RCS file: /cvs/gsl/shell/shell/source/unix/misc/gnome-open-url.sh,v -retrieving revision 1.3 -diff -u -u -r1.3 gnome-open-url.sh ---- shell/source/unix/misc/gnome-open-url.sh 13 May 2005 07:31:07 -0000 1.3 -+++ shell/source/unix/misc/gnome-open-url.sh 6 Jun 2005 09:43:06 -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: shell/source/unix/misc/kde-open-url.sh -=================================================================== -RCS file: /cvs/gsl/shell/shell/source/unix/misc/kde-open-url.sh,v -retrieving revision 1.2 -diff -u -u -r1.2 kde-open-url.sh ---- shell/source/unix/misc/kde-open-url.sh 10 May 2004 13:08:06 -0000 1.2 -+++ shell/source/unix/misc/kde-open-url.sh 6 Jun 2005 09:43:06 -0000 -@@ -51,9 +51,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 -Index: shell/source/unix/misc/open-url.sh -=================================================================== -RCS file: /cvs/gsl/shell/shell/source/unix/misc/open-url.sh,v -retrieving revision 1.2 -diff -u -u -r1.2 open-url.sh ---- shell/source/unix/misc/open-url.sh 10 May 2004 13:08:30 -0000 1.2 -+++ shell/source/unix/misc/open-url.sh 6 Jun 2005 09:43:06 -0000 -@ -79,6 +79,10 @@ - $BROWSER "$1" & - exit 0 - fi -+ if [ -x /usr/bin/sensible-browser ]; then -+ sensible-browser "$1" -+ exit 0 -+ fi - # mozilla derivates may need -remote semantics - for i in firefox mozilla netscape; do - browser=`which $i` |