FFe: Sync conkeror 0.9.3+git110307-2 (universe) from Debian unstable (main)

[Micah Gersten]

Please sync conkeror 0.9.3+git110307-2 (universe) from Debian unstable (main)

Explanation of the Ubuntu delta and why it can be dropped:
Ubuntu Delta was to give priority to xulrunner-2.0 which is now in the Debian revision.

Explanation of FeatureFreeze exception:
There's one new feature, doing case sensitive matching on searches. This version has some xulrunner-2.0 integration bugs fixed.

Changelog entries since current natty version 0.9.3+git110213-1ubuntu1:

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 <email address hidden> Tue, 08 Mar 2011 16:28:38 +0100

conkeror (0.9.3+git110307-1) unstable; urgency=low

  * New upstream snapshot
    - Fixes network and SSL error pages under xulrunner-2.0

 -- Axel Beckert <email address hidden> Mon, 07 Mar 2011 18:05:33 +0100

conkeror (0.9.3+git110224-1) unstable; urgency=low

  * New upstream snapshot
    - Further xulrunner-2.0 fixes
  * Add missing alternative dependency on xulrunner-2.0 (Thanks to Micah
    Gersten!)
  * Also look for xulrunner-2.0 in debian/conkeror.bin aka /usr/bin/conkeror

 -- Axel Beckert <email address hidden> Thu, 24 Feb 2011 19:46:28 +0100

conkeror (0.9.3+git110219-1) unstable; urgency=low

  * The Works-with-2.0 Package
  * New upstream snapshot
    - Minor fixes for xulrunner-2.0 support
  * debian/rules: Include chrome.manifest which is necessary for
    xulrunner-2.0 support.

 -- Axel Beckert <email address hidden> Sat, 19 Feb 2011 08:02:05 +0100

[Martin Pitt (pitti)]

Seems fine, approved. Subscribing -archive.

[Colin Watson (cjwatson)]

[Updating] conkeror (0.9.3+git110213-1ubuntu1 [Ubuntu] < 0.9.3+git110307-2 [Debian])
 * Trying to add conkeror...
2011-03-15 11:22:23 INFO - <conkeror_0.9.3+git110307.orig.tar.gz: downloading from http://ftp.debian.org/debian/>
2011-03-15 11:22:23 INFO - <conkeror_0.9.3+git110307-2.diff.gz: downloading from http://ftp.debian.org/debian/>
2011-03-15 11:22:23 INFO - <conkeror_0.9.3+git110307-2.dsc: downloading from http://ftp.debian.org/debian/>
I: conkeror [universe] -> conkeror_0.9.3+git110213-1ubuntu1 [universe].
I: conkeror [universe] -> conkeror-spawn-process-helper_0.9.3+git110213-1ubuntu1 [universe].