From a80792e7e2a99eb2e9664ef6bdfffe4f0fa1851f Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Sat, 4 Aug 2012 14:57:30 +0200
Subject: [PATCH] Debian package: Add support for xulrunner 15 and 16

Add support for xulrunner-15.0 and xulrunner-16.0 with according
versioned dependencies. Also add conflicts for earlier package
versions of xulrunner-15.0 and xulrunner-16.0 as them just being
unpacked will break the conkeror package (and not them). Also add
Lintian overrides for using Conflicts instead of Breaks.

xulrunner-14.0 is currently not supported as it has been already
released and getting the issue which has been fixed in xulrunner 15b3
and 16a2 in a released version is more work and therefore hasn't
happened yet. Not sure if it will happen at all.

Includes one minor optimization: debian/conkeror.bin (the wrapper
script which is installed as /usr/bin/conkeror) now uses `seq 13.0 -1
5.0` instead of `seq 5.0 13.0 | tac` in conkeror.bin. That saves one
fork and one redirection.
---
 debian/changelog                  | 11 +++++++++++
 debian/conkeror.bin               |  3 ++-
 debian/conkeror.lintian-overrides |  5 +++++
 debian/control                    |  5 +++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 500a5b3..6649cd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+conkeror (1.0~~pre+git120804-1) UNRELEASED; urgency=low
+
+  * Add support for xulrunner 15 and 16 with according versioned
+    dependencies plus conflicts for earlier package versions (See #683157
+    and https://bugzilla.mozilla.org/show_bug.cgi?id=756786)
+  * Add Lintian overrides for using Conflicts instead of Breaks as
+    Conkeror fails if these versions are just only unpacked.
+  * Use `seq 13.0 -1 5.0` instead of `seq 5.0 13.0 | tac` in conkeror.bin
+
+ -- Axel Beckert <abe@debian.org>  Sat, 04 Aug 2012 14:48:27 +0200
+
 conkeror (1.0~~pre+git120527-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/conkeror.bin b/debian/conkeror.bin
index 3f9d51b..7ebf264 100644
--- a/debian/conkeror.bin
+++ b/debian/conkeror.bin
@@ -4,7 +4,8 @@
 
 # Find an appropriate xulrunner binary
 XULRUNNER=''
-for version in `LC_ALL=C seq 5.0 13.0 | tac` 2.0 1.9.2 1.9.1; do
+# Due to http://bugs.debian.org/683157 we currently have to skip xulrunner-14.0
+for version in  16.0 15.0 `LC_ALL=C seq 13.0 -1 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/conkeror.lintian-overrides b/debian/conkeror.lintian-overrides
index 7012280..2b462ff 100644
--- a/debian/conkeror.lintian-overrides
+++ b/debian/conkeror.lintian-overrides
@@ -2,3 +2,8 @@
 # #562986 and http://wiki.debian.org/mozilla-devscripts)
 conkeror binary: unknown-field-in-control xul-appid
 
+# Conkeror fails if these versions are just only unpacked, hence
+# Conflicts, not only Breaks. See http://bugs.debian.org/683157
+conkeror: conflicts-with-version xulrunner-15.0 (<< 15.0~b3)
+conkeror: conflicts-with-version xulrunner-16.0 (<< 16.0~a2+20120803042008)
+
diff --git a/debian/control b/debian/control
index aa3e981..a40a913 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Package: conkeror
 Architecture: all
 Depends: ${misc:Depends},
  xulrunner-10.0  |
+ xulrunner-16.0 (>= 16.0~a2+20120803042008) |
+ xulrunner-15.0 (>= 15.0~b3) |
  xulrunner-13.0  |
  xulrunner-12.0  |
  xulrunner-11.0  |
@@ -26,6 +28,9 @@ Depends: ${misc:Depends},
  firefox (>= 3.5)
 Recommends: conkeror-spawn-process-helper, xdg-utils
 Breaks: conkeror-spawn-process-helper (<< 0.9~git080901-1)
+Conflicts:
+ xulrunner-16.0 (<< 16.0~a2+20120803042008),
+ xulrunner-15.0 (<< 15.0~b3)
 Suggests: emacs | emacsen
 Provides: www-browser
 Xb-Xul-AppId: {a79fe89b-6662-4ff4-8e88-09950ad4dfde}
-- 
2.11.4.GIT