[libbrowserlauncher-java] 01/03: Try harder to find a valid browser on a Debian system

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libbrowserlauncher-java.

commit 00c0d270cd946b2b01c2611ac3eba2aa6d02083b
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 11 13:32:29 2016 +0200

    Try harder to find a valid browser on a Debian system
---
 debian/changelog                    |  6 ++++++
 debian/patches/browser_choice.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series               |  3 ++-
 debian/rules                        | 11 +----------
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e66c3d8..667188c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libbrowserlauncher-java (1.3+dfsg-2) UNRELEASED; urgency=medium
+
+  * Try harder to find a valid browser on a Debian system
+
+ -- Andreas Tille <tille at debian.org>  Wed, 11 May 2016 13:31:20 +0200
+
 libbrowserlauncher-java (1.3+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #811365)
diff --git a/debian/patches/browser_choice.patch b/debian/patches/browser_choice.patch
new file mode 100644
index 0000000..1d7c26b
--- /dev/null
+++ b/debian/patches/browser_choice.patch
@@ -0,0 +1,35 @@
+Description: Try harder to find a valid browser on a Debian system
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 11 May 2016 13:31:20 +0200
+
+--- a/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
++++ b/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
+@@ -24,10 +24,11 @@ delimchar=;
+ 
+ # list of browsers and arguments for using them
+ # display name | executable name | start browser args | invoke already started browser | force new window
+-browser.mozilla=Mozilla;mozilla;<browser> <url>;<browser> -remote openURL(<url>)
+-browser.netscape=Netscape;netscape;<browser> <url>;<browser> -remote openURL(<url>)
+ browser.firefox=FireFox;firefox;<browser> <url>;<browser> -new-tab <url>;<browser> -new-window <url>
++browser.ceweasel=IceWeasel;iceweasel;<browser> <url>;<browser> -new-tab <url>;<browser> -new-window <url>
+ browser.mozilla-firefox=FireFox;mozilla-firefox;<browser> <url>;<browser> -remote openURL(<url>);<browser> -new-window <url>
+ browser.konqueror=Konqueror;kfmclient;<browser> openURL <url>;<browser> newTab <url>;<browser> openURL <url>
+ browser.opera=Opera;opera;<browser> <url>;<browser> -newpage <url>;<browser> -newwindow <url>
+ browser.epiphany=Epiphany;epiphany;<browser> <url>;<browser> --new-tab <url>
++browser.default=DebianDefaultBrowser;www-browser;<browser> <url>;<browser> <url>
++
+--- a/source/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
++++ b/source/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
+@@ -24,10 +24,10 @@ delimchar=;
+ 
+ # list of browsers and arguments for using them
+ # display name | executable name | start browser args | invoke already started browser | force new window
+-browser.mozilla=Mozilla;mozilla;<browser> <url>;<browser> -remote openURL(<url>)
+-browser.netscape=Netscape;netscape;<browser> <url>;<browser> -remote openURL(<url>)
+ browser.firefox=FireFox;firefox;<browser> <url>;<browser> -new-tab <url>;<browser> -new-window <url>
++browser.iceweasel=IceWeasel;iceweasel;<browser> <url>;<browser> -new-tab <url>;<browser> -new-window <url>
+ browser.mozilla-firefox=FireFox;mozilla-firefox;<browser> <url>;<browser> -remote openURL(<url>);<browser> -new-window <url>
+ browser.konqueror=Konqueror;kfmclient;<browser> openURL <url>;<browser> newTab <url>;<browser> openURL <url>
+ browser.opera=Opera;opera;<browser> <url>;<browser> -newpage <url>;<browser> -newwindow <url>
+ browser.epiphany=Epiphany;epiphany;<browser> <url>;<browser> --new-tab <url>
++browser.default=DebianDefaultBrowser;www-browser;<browser> <url>;<browser> <url>
diff --git a/debian/patches/series b/debian/patches/series
index 2422b9b..77c026e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-utf-8.patch
+# utf-8.patch
+browser_choice.patch
diff --git a/debian/rules b/debian/rules
index b11c63e..e99e193 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,19 +2,10 @@
 
 # DH_VERBOSE := 1
 
-# some helpful variables - uncomment them if needed
-# shamelessly stolen from http://jmtd.net/log/awk/
-#DEBVERS        := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-#VERSION        := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-#DEBFLAVOR      := $(shell dpkg-parsechangelog | awk '/^Distribution:/ {print $$2}')
-#DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-#DEBIAN_BRANCH  := $(shell awk 'BEGIN{FS="[= ]+"} /debian-branch/ {print $$2}' debian/gbp.conf)
-#GIT_TAG        := $(subst ~,_,$(VERSION))
-
 JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --with javahelper
+	 LC_ALL=C.UTF-8 dh $@ --with javahelper
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libbrowserlauncher-java.git