Merge lp:~thibault.lemaitre/ubuntu/natty/grass/use-preferred-web-browser into lp:ubuntu/natty/grass

[Thibault Lemaitre]

In Ubuntu the default web browser (or HTML browser in this case) of the user correspond to xdg-open and not to x-www-browser. I changed it in the debian/patches/www-browser.dpatch file.

[Sebastien Bacher (seb128)]

thank you for your work but the package is in sync with debian and a such chane would apply to debian as well so should be sent to the debian bts (http://bugs.debian.org), checking for "/usr/bin/x-www-browser" and then using "xdg-open" seems also wrong, you should rather add a case to use xdg-open if available before the current logic. Setting the merge request as "Work in progress", please set it back to "Needs review" if you get an update to review

[Thibault Lemaitre (thibault.lemaitre)]

I did some modifications and push it. That's ready to be reviewed

[Chris Halse Rogers (raof)]

I've applied this as a git commit to the Debian packaging branch and forwarded it as Debian bug 615667 (you can track this at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615667 ).

As Seb said, we currently copy this package unmodified from Debian. This means less duplicated effort, and hence higher-quality packages in Ubuntu. Once your patch is applied in Debian we should sync the package - although it's a new upstream, it's the final release rather than a pre-release snapshot and most of the changes were already backported.

Thanks for your contribution to Ubuntu!

[Martin Pitt (pitti)]

(Closing MP then, as this has been fully handled as far as sponsoring goes)

Unmerged revisions

16. By Thibault Lemaitre on 2011-02-20

Introduce a test of xdg-open presence before the test of x-www-browser

15. By Thibault Lemaitre on 2011-02-15

In Ubuntu the default web browser (or HTML browser in this case) of the user correspond to xdg-open and not to x-www-browser

=== modified file 'debian/patches/www-browser.dpatch'
--- debian/patches/www-browser.dpatch	2009-02-17 12:00:13 +0000
+++ debian/patches/www-browser.dpatch	2011-02-20 18:33:34 +0000
@@ -44,7 +44,9 @@
 -	done
 -	if [ -n "$GRASS_HTML_BROWSER" ] ; then
 -	   break
-+	if [ -x /usr/bin/x-www-browser ] ; then
++	if [ -x /usr/bin/xdg-open ] ; then
++		GRASS_HTML_BROWSER=xdg-open
++	elif [ -x /usr/bin/x-www-browser ] ; then
 +		GRASS_HTML_BROWSER=x-www-browser
 +	else 
 +		GRASS_HTML_BROWSER=true