From cb48a263d2978da2e3582d5a66fa0249fedb0538 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 8 Jul 2009 19:14:42 +0200 Subject: [PATCH] Support Debian's upcoming xulrunner-1.9.1 packages The conkeror Debian package now works with the upcoming experimental xulrunner-1.9.1 packages (see http://glandium.org/blog/?p=370) in Debian, too. Since conkeror still throws much more warnings with xulrunner 1.9.1 than with 1.9.0.x, for now the package currently prefers 1.9.0.x over 1.9.1 if both are installed. Call "xulrunner-1.9.1 /usr/share/conkeror/application.ini" if you have xulrunner-1.9 and xulrunner-1.9.1 installed and want to checkout conkeror in combination with xulrunner 1.9.1. --- debian/changelog | 6 ++++++ debian/conkeror.bin | 2 +- debian/control | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bbdf242..a8fa8d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +conkeror (0.9~git090708-1) UNRELEASED; urgency=low + + * Added alternative dependency on xulrunner-1.9.1 + + -- Axel Beckert Wed, 08 Jul 2009 18:43:58 +0200 + conkeror (0.9~git090624-1) unstable; urgency=low * Based on new snapshot (tagged with debian-0.9--git090624-1) diff --git a/debian/conkeror.bin b/debian/conkeror.bin index 7edae92..d839dca 100755 --- a/debian/conkeror.bin +++ b/debian/conkeror.bin @@ -4,7 +4,7 @@ # Find an appropriate xulrunner binary XULRUNNER='' -for xr in xulrunner-1.9 xulrunner; do +for xr in xulrunner-1.9 xulrunner xulrunner-1.9.1; do XRTMP=`which $xr` if [ -n "$XRTMP" -a -x "$XRTMP" ]; then if expr `$XRTMP --gre-version | cut -d . -f 1,2` '>=' 1.9 > /dev/null; then diff --git a/debian/control b/debian/control index bea1a56..2f2a040 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Git: git://repo.or.cz/conkeror.git Package: conkeror Architecture: all -Depends: xulrunner (>= 1.9~) | xulrunner-1.9 +Depends: xulrunner (>= 1.9~) | xulrunner-1.9 | xulrunner-1.9.1 Recommends: conkeror-spawn-process-helper Conflicts: conkeror-spawn-process-helper (< 0.9~git080901-1) Suggests: emacs | emacsen -- 2.11.4.GIT