From b9a2a0b2eaae3d3991bdfa1f5ce39da0fc7170bb Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Tue, 8 Mar 2011 16:43:25 +0100
Subject: [PATCH] Debian package: change xulrunner version search order

---
 debian/NEWS         | 26 ++++++++++++++++++++++++++
 debian/changelog    | 11 +++++++++++
 debian/conkeror.bin |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/debian/NEWS b/debian/NEWS
index e1bf892..89ded4d 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,29 @@
+conkeror (0.9.3+git110307-2) unstable; urgency=low
+
+  The search order for searching xulrunner binaries has been changed
+  since current state became quite confusing:
+  
+  /usr/bin/conkeror first looked for the xulrunner of Squeeze and Sid
+  (1.9.1), then the (former) experimental xulrunner (1.9.2), then the
+  one from Lenny (1.9.0/generic 1.9), then the current one from
+  experimental (2.0), and then for generic ones like the one from
+  Sarge.
+  
+  It now looks first for xulrunner 2.0, then 1.9.2, then 1.9.1, then
+  1.9 (aka 1.9.0) and then for a xulrunner binary without version
+  suffix (as e.g. xulrunner 1.8 from Sarge used to be called). This
+  means it now checks for the highest version first, then checks for
+  lower and less specific versions, taking the generic one as last
+  one.
+  
+  This should be more future-proof and is less Debian-centric,
+  i.e. helps Debian-based distributions which maintain their own
+  xulrunner packages. But it also helps people who have the xulrunner
+  packages from experimental installed as conkeror now uses the xulrunner
+  version from experimental if it is installed.
+
+ -- Axel Beckert <abe@debian.org>  Tue, 08 Mar 2011 16:41:21 +0100
+
 conkeror (0.9.3+git110213-1) unstable; urgency=low
 
   * The format of the auto-save session file has changed slightly to be
diff --git a/debian/changelog b/debian/changelog
index d9bd820..ff987e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+conkeror (0.9.3+git110307-2) unstable; urgency=low
+
+  * debian/conkeror.bin: Change search order for searching xulrunner
+    binaries from the confusing current state of "squeeze/sid, (former)
+    experimental, lenny, experimental, generic/sarge" to descending
+    "highest, most specific versions first; lowest, generic versions
+    last", so it should take the newest xulrunner version which is
+    installed.
+
+ -- Axel Beckert <abe@debian.org>  Tue, 08 Mar 2011 16:28:38 +0100
+
 conkeror (0.9.3+git110307-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/conkeror.bin b/debian/conkeror.bin
index a3a8be9..bdf5d56 100644
--- a/debian/conkeror.bin
+++ b/debian/conkeror.bin
@@ -4,7 +4,7 @@
 
 # Find an appropriate xulrunner binary
 XULRUNNER=''
-for xr in xulrunner-1.9.1 xulrunner-1.9.2 xulrunner-1.9 xulrunner-2.0 xulrunner; do
+for xr in xulrunner-2.0 xulrunner-1.9.2 xulrunner-1.9.1 xulrunner-1.9 xulrunner; 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
-- 
2.11.4.GIT