Bug#351901: [sensible-browser] Please prefer gnome-www-browser over x-www-browser

[Loïc Minier]

Package: debianutils
Version: 2.15.2
Severity: wishlist
Tags: patch

        Hi,

 The GNOME browsers packages (Galeon, Epiphany, Firefox Gnome Support)
 have been modified in order to register the gnome-www-browser
 alternative.  I wish sensible-browser would prefer launching
 gnome-www-browser instead of x-www-browser when running GNOME (see
 attached patch).

 This would in turn permit GNOME to use "sensible-browser" as its
 default browser under Debian.

   Cheers,

PS: the patch also changes slightly how x-terminal-emulator is run for
consistency

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages debianutils depends on:
ii  coreutils                     5.93-5     The GNU core utilities
ii  libc6                         2.3.5-12.1 GNU C Library: Shared libraries an

debianutils recommends no packages.

-- no debconf information

-- 
Loïc Minier <[EMAIL PROTECTED]>
Current Earth status:   NOT DESTROYED

diff -urN debianutils-2.15.2/debian/changelog 
debianutils-2.15.3/debian/changelog
--- debianutils-2.15.2/debian/changelog 2005-12-11 18:32:01.000000000 +0100
+++ debianutils-2.15.3/debian/changelog 2006-02-08 12:09:59.000000000 +0100
@@ -1,3 +1,12 @@
+debianutils (2.15.3) unstable; urgency=low
+
+  * sensible-browser: prefer running gnome-www-browser or gnome-terminal +
+    www-browser if under GNOME.
+  * sensible-browser: invoke x-terminal-emulator with its full path for
+    consistency.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed,  8 Feb 2006 12:08:15 +0100
+
 debianutils (2.15.2) unstable; urgency=low
 
   * Start shipping and installing a starter /etc/shells.
diff -urN debianutils-2.15.2/sensible-browser 
debianutils-2.15.3/sensible-browser
--- debianutils-2.15.2/sensible-browser 2002-12-04 00:53:40.000000000 +0100
+++ debianutils-2.15.3/sensible-browser 2006-02-08 12:07:26.000000000 +0100
@@ -20,13 +20,24 @@
        exit 1;
 }
 
+if (exists $ENV{GNOME_DESKTOP_SESSION_ID}) {
+       if (-e '/usr/bin/gnome-www-browser') {
+               exec '/usr/bin/gnome-www-browser', $url;
+               exit 1;
+       }
+       elsif (-e '/usr/bin/gnome-terminal' && -e '/usr/bin/www-browser') {
+               exec "/usr/bin/gnome-terminal", "-e", "/usr/bin/www-browser 
$url";
+               exit 1;
+       }
+}
+
 if (exists $ENV{DISPLAY}) {
        if (-e '/usr/bin/x-www-browser') {
                exec '/usr/bin/x-www-browser', $url;
                exit 1;
        }
        elsif (-e '/usr/bin/x-terminal-emulator' && -e '/usr/bin/www-browser') {
-               exec "x-terminal-emulator", "-e", "/usr/bin/www-browser", $url;
+               exec "/usr/bin/x-terminal-emulator", "-e", 
"/usr/bin/www-browser", $url;
                exit 1;
        }
 }