From: Axel Beckert <abe@deuxchevaux.org>
Date: Sat, 17 Aug 2013 14:29:18 +0000 (+0200)
Subject: Add xulrunner 25 support
X-Git-Tag: debian-1.0--pre-1+git160130-1~147
X-Git-Url: https://repo.or.cz/w/conkeror.git/commitdiff_plain/edcd66414ee20c9bd45c4b14b40225624aa822d5

Add xulrunner 25 support
---

diff --git a/debian/bin/conkeror b/debian/bin/conkeror
index 02e05db..69cea7d 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 24.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 25.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 5639d0b..7832702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+conkeror (1.0~~pre+git130817-1) unstable; urgency=low
+
+  * New upstream snapshot
+  * Add support for xulrunner 25.
+
+ -- Axel Beckert <abe@debian.org>  Sat, 17 Aug 2013 15:42:01 +0200
+
 conkeror (1.0~~pre+git130522-2) unstable; urgency=low
 
   * Add support for xulrunner 24.
diff --git a/debian/control b/debian/control
index 86e01f8..8cd77fa 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Package: conkeror
 Architecture: all
 Depends: ${misc:Depends},
  xulrunner-17.0  |
+ xulrunner-25.0  |
  xulrunner-24.0  |
  xulrunner-23.0  |
  xulrunner-22.0  |