From 5c90de516802c7a60066095392cff343c630d645 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 15 Mar 2012 04:31:25 +0100 Subject: [PATCH] Debian Package: Support xulrunner-12.0 --- debian/changelog | 6 +++++- debian/conkeror.bin | 2 +- debian/control | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ee7ae1c..e5ec389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -conkeror (1.0~~pre+git120222-1) UNRELEASED; urgency=low +conkeror (1.0~~pre+git120315-1) UNRELEASED; urgency=low * New upstream snapshot - Update debian patches to fit new module API * Update buildd-ports webjump. Thanks Christoph Egger! * Add debpopcon webjump. * Also install new file content-policy.manifest. Thanks Joseph Gay! + * Support xulrunner 12.0 + - Update search list in debian/conkeror.bin + - Add alternative dependency on xulrunner-12.0 + * Make 10.0 (ESR) first xulrunner dependency. -- Axel Beckert Wed, 22 Feb 2012 23:22:19 +0100 diff --git a/debian/conkeror.bin b/debian/conkeror.bin index 46aede3..12e282e 100644 --- a/debian/conkeror.bin +++ b/debian/conkeror.bin @@ -4,7 +4,7 @@ # Find an appropriate xulrunner binary XULRUNNER='' -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 +for version in 12.0 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 1fe45ef..1ec670b 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-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} +Depends: xulrunner-10.0 | xulrunner-12.0 | xulrunner-11.0 | xulrunner-9.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