From 4c593829017926957e8bd383f9fefcb383c57f4b Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 27 Dec 2011 02:23:14 +0100 Subject: [PATCH] Debian package: XULRunner Bump: Default is 9.0, add support for 11.0 --- debian/changelog | 7 ++++--- debian/conkeror.bin | 2 +- debian/control | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3e5ed7..d263ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,20 +5,21 @@ conkeror (1.0~~pre-1) UNRELEASED; urgency=low * Upstream changed minimum xulrunner requirement to 1.9.1: Update debian/control and debian/conkeror.bin accordingly. * Reorder xulrunner alternative dependencies so the current xulrunner - from unstable (8.0) is chosen by default. + from unstable (9.0) is chosen by default. * Make package usable on Ubuntu again despite their xulrunner removal. - debian/control: Add alternative dependencies on firefox instead of xulrunner - debian/conkeror.bin: If no xulrunner is found, look for firefox instead - debian/control: Update long description to mention Firefox, too. - * Add alternative dependencies on xulrunner-10.0 and xulrunner-9.0. + * Add alternative dependencies on xulrunner-11.0, -10.0, and -9.0. + * Support xulrunner 11.0 in debian/conkeror.bin [ Luca Capello ] * Support xulrunner 10.0 and 9.0 in debian/conkeror.bin, drop support for unversioned xulrunner binaries. (Closes: #649199) - -- Axel Beckert Sat, 19 Nov 2011 01:42:05 +0100 + -- Axel Beckert Tue, 27 Dec 2011 02:18:41 +0100 conkeror (0.9.4-1) unstable; urgency=low diff --git a/debian/conkeror.bin b/debian/conkeror.bin index 34087fa..46aede3 100644 --- a/debian/conkeror.bin +++ b/debian/conkeror.bin @@ -4,7 +4,7 @@ # Find an appropriate xulrunner binary XULRUNNER='' -for version in 10.0 9.0 8.0 7.0 6.0 5.0 2.0 1.9.2 1.9.1; do +for version in 11.0 10.0 9.0 8.0 7.0 6.0 5.0 2.0 1.9.2 1.9.1; do XRTMP=`which xulrunner-$version` if [ -n "$XRTMP" -a -x "$XRTMP" ]; then XULRUNNER=$XRTMP diff --git a/debian/control b/debian/control index 7715e56..1fe45ef 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Git: git://repo.or.cz/conkeror.git Package: conkeror Architecture: all -Depends: xulrunner-8.0 | xulrunner-10.0 | xulrunner-9.0 | xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-2.0 | xulrunner-1.9.2 | xulrunner-1.9.1 | firefox (>= 3.5), ${misc:Depends} +Depends: xulrunner-9.0 | xulrunner-11.0 | xulrunner-10.0 | xulrunner-8.0 | xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-2.0 | xulrunner-1.9.2 | xulrunner-1.9.1 | firefox (>= 3.5), ${misc:Depends} Recommends: conkeror-spawn-process-helper Breaks: conkeror-spawn-process-helper (<< 0.9~git080901-1) Suggests: emacs | emacsen -- 2.11.4.GIT