From 46424753cfb5e9d13316d23c5ed2bd0958e90ce8 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Sat, 14 Jun 2014 13:04:06 +0200
Subject: [PATCH] Debian package: Support using "iceweasel -app" since there's
 no more xulrunner. :-(

---
 debian/bin/conkeror | 29 +++++++++++++++++++----------
 debian/changelog    |  1 +
 debian/control      |  1 +
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/debian/bin/conkeror b/debian/bin/conkeror
index af7c749..ea4c774 100644
--- a/debian/bin/conkeror
+++ b/debian/bin/conkeror
@@ -4,16 +4,25 @@
 
 # Find an appropriate xulrunner binary
 XULRUNNER=''
-# Due to http://bugs.debian.org/683157 we have to skip xulrunner-14.0
-for version in `LC_ALL=C seq 30 -1 15` `LC_ALL=C seq 13 -1 5` 2 1.9.2 1.9.1; do
-    for subversion in $version $version.0; do
-        XRTMP=`which xulrunner-$subversion`
-        if [ -n "$XRTMP" -a -x "$XRTMP" ]; then
-	    XULRUNNER=$XRTMP
-	    break 2
-        fi
+
+# *sigh* No more xulrunner since iceweasel 30
+if [ -x /usr/bin/iceweasel ]; then
+    XULRUNNER="/usr/bin/iceweasel -app"
+fi
+
+
+if [ -z "$XULRUNNER" ]; then
+    # Due to http://bugs.debian.org/683157 we have to skip xulrunner-14.0
+    for version in `LC_ALL=C seq 30 -1 15` `LC_ALL=C seq 13 -1 5` 2 1.9.2 1.9.1; do
+        for subversion in $version $version.0; do
+            XRTMP=`which xulrunner-$subversion`
+            if [ -n "$XRTMP" -a -x "$XRTMP" ]; then
+	        XULRUNNER=$XRTMP
+	        break 2
+            fi
+        done
     done
-done
+fi
 
 # Try firefox if no xulrunner can be found
 if [ -z "$XULRUNNER" ]; then
@@ -25,7 +34,7 @@ if [ -z "$XULRUNNER" ]; then
 fi
 
 if [ -z "$XULRUNNER" ]; then
-    echo "xulrunner version 1.9.1 (or firefox version 3.5) or newer required, but not found. Bailing out." 1>&2
+    echo "xulrunner version 1.9.1 (or iceweasel/firefox version 3.5) or newer required, but not found. Bailing out." 1>&2
     exit 1;
 fi
 
diff --git a/debian/changelog b/debian/changelog
index 0699a98..9fcfcc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 conkeror (1.0~~pre-1+git140614-1) UNRELEASED; urgency=medium
 
   * New upstream pre-release 1.0pre1
+  * Support using "iceweasel -app" since there's no more xulrunner. :-(
 
  -- Axel Beckert <abe@debian.org>  Sat, 14 Jun 2014 12:49:42 +0200
 
diff --git a/debian/control b/debian/control
index bfce814..281c426 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Vcs-Git: git://repo.or.cz/conkeror.git
 Package: conkeror
 Architecture: all
 Depends: ${misc:Depends},
+         iceweasel (>= 3.5) |
          xulrunner-24.0  |
          xulrunner-30    |
          xulrunner-29    |
-- 
2.11.4.GIT