From 8d11dbc5f3c49e9bca0ba8512f79aaa0b2c56f03 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 4 Feb 2010 16:43:35 +0100 Subject: [PATCH] Debian: Add alternative dependency on xulrunner-1.9.2; reorder alternatives --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 09af353..9a3028a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ conkeror (0.9.1+git100131-2) UNRELEASED; urgency=low * Add a lintian override for the non-standard Xb-Xul-AppId header * Removed Luca from the uploaders list (on his request) + * Add alternative dependency on upcoming experimental xulrunner-1.9.2. + * Reorder xulrunner dependencies to have the preferred versions first + instead of sorting by package name. -- Axel Beckert Tue, 02 Feb 2010 18:33:01 +0100 diff --git a/debian/control b/debian/control index 75fcf31..450e045 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 (>= 1.9~) | xulrunner-1.9 | xulrunner-1.9.1, ${misc:Depends} +Depends: xulrunner-1.9.1 | xulrunner-1.9.2 | xulrunner-1.9 | xulrunner (>= 1.9~), ${misc:Depends} Recommends: conkeror-spawn-process-helper Conflicts: conkeror-spawn-process-helper (<< 0.9~git080901-1) Suggests: emacs | emacsen -- 2.11.4.GIT