From f8beca7f44e5a1ef5f4ec9cff666acc045ebae6c Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sat, 2 Mar 2019 16:34:43 +0100 Subject: [PATCH] Debian package: Support waterfox as alternative to old firefoxes and iceweasels Prefer waterfox over firefox. --- debian/bin/conkeror | 6 ++++-- debian/changelog | 7 +++++++ debian/control | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/bin/conkeror b/debian/bin/conkeror index ec842d9..29276db 100644 --- a/debian/bin/conkeror +++ b/debian/bin/conkeror @@ -10,7 +10,9 @@ export XUL_APP_FILE XULRUNNER='' # *sigh* No more xulrunner since iceweasel 30 -if [ -x /usr/bin/firefox-esr ]; then +if [ -x /usr/bin/waterfox ]; then + XULRUNNER="/usr/bin/waterfox" +elif [ -x /usr/bin/firefox-esr ]; then XULRUNNER="/usr/bin/firefox-esr" elif [ -x /usr/bin/iceweasel ]; then XULRUNNER="/usr/bin/iceweasel" @@ -19,7 +21,7 @@ elif [ -x /usr/bin/firefox ]; then fi if [ -z "$XULRUNNER" ]; then - echo "No Firefox or Iceweasel found. Bailing out." 1>&2 + echo "No Waterfox or Firefox or Iceweasel found. Bailing out." 1>&2 exit 1; fi diff --git a/debian/changelog b/debian/changelog index fcecd66..ba229ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +conkeror (1.0.4-2) UNRELEASED; urgency=medium + + * Support waterfox as alternative to old firefoxes and iceweasels. + + Prefer waterfox over firefox. + + -- Axel Beckert Sat, 02 Mar 2019 15:39:03 +0100 + conkeror (1.0.4-1) unstable; urgency=medium * New upstream snapshot. diff --git a/debian/control b/debian/control index 03ab2bc..e5b8c9d 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Rules-Requires-Root: no Package: conkeror Architecture: all Depends: ${misc:Depends}, - firefox (<< 57~) | firefox-esr (<< 57~) | iceweasel (<< 57~) + waterfox | firefox (<< 57~) | firefox-esr (<< 57~) | iceweasel (<< 57~) Recommends: conkeror-spawn-process-helper, xdg-utils Breaks: conkeror-spawn-process-helper (<< 0.9~git080901-1) -- 2.11.4.GIT