From 0cea7e18eaab6daa50e4ce8e6f55244a39d154f5 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sat, 19 Nov 2011 02:02:23 +0100 Subject: [PATCH] Debian package: Reorder xulrunner alternative dependencies so the current xulrunner from unstable (8.0) is chosen by default --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a887291..a3e5ed7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ 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 (7.0) is chosen by default. + from unstable (8.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 diff --git a/debian/control b/debian/control index 14f7b2e..7715e56 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-7.0 | xulrunner-10.0 | xulrunner-9.0 | xulrunner-8.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-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} Recommends: conkeror-spawn-process-helper Breaks: conkeror-spawn-process-helper (<< 0.9~git080901-1) Suggests: emacs | emacsen -- 2.11.4.GIT