From: Axel Beckert <abe@deuxchevaux.org>
Date: Mon, 4 Mar 2013 19:37:46 +0000 (+0100)
Subject: Debian package: Support XULRunner up to 22
X-Git-Tag: debian-1.0--pre-1+git160130-1~160
X-Git-Url: https://repo.or.cz/w/conkeror.git/commitdiff_plain/9e4d9f0a1aa21eef67ee435540009de4e297f057

Debian package: Support XULRunner up to 22

Support for newer Xulrunners closes #699239

Also bump package version to today
---

diff --git a/debian/bin/conkeror b/debian/bin/conkeror
index a78bbc3..7856b52 100644
--- a/debian/bin/conkeror
+++ b/debian/bin/conkeror
@@ -5,7 +5,7 @@
 # Find an appropriate xulrunner binary
 XULRUNNER=''
 # Due to http://bugs.debian.org/683157 we currently have to skip xulrunner-14.0
-for version in `LC_ALL=C seq 20.0 -1 15.0` `LC_ALL=C seq 13.0 -1 5.0` 2.0 1.9.2 1.9.1; do
+for version in `LC_ALL=C seq 22.0 -1 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/changelog b/debian/changelog
index c2e1ee9..b1f0a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-conkeror (1.0~~pre+git130117-1) UNRELEASED; urgency=low
+conkeror (1.0~~pre+git130407-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
     - Properly passes CFLAGS, fully enables dpkg build flags
-  * Add support for xulrunner 18 to 20
+  * Add support for xulrunner 18 to 22 (Closes: #699239)
   * Bump debhelper compatibility to 9
     - Remove inclusion of buildflags.mk from debian/rules, no more needed
   * Clean up debian/rules:
@@ -12,7 +12,7 @@ conkeror (1.0~~pre+git130117-1) UNRELEASED; urgency=low
     - Use more debhelper magic, no more manual cp, ln, or mkdir.
     - Finally switch to a dh style debian/rules.
 
- -- Axel Beckert <abe@debian.org>  Thu, 17 Jan 2013 01:42:48 +0100
+ -- Axel Beckert <abe@debian.org>  Sun, 07 Apr 2013 01:11:16 +0200
 
 conkeror (1.0~~pre+git120901-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 6b55b8a..cba7d06 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Package: conkeror
 Architecture: all
 Depends: ${misc:Depends},
  xulrunner-10.0  |
+ xulrunner-22.0  |
+ xulrunner-21.0  |
  xulrunner-20.0  |
  xulrunner-19.0  |
  xulrunner-18.0  |