Bug#699340: unblock: uzbl/0.0.0~git.20120514-1.1

[Andreas Beckmann <anbe@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package uzbl

  * Preserve x-www-browser alternative on upgrades.
  * Remove x-www-browser alternative on uninstallation.  (Closes: #656222)

Otherwise this may destroy manual setting of the x-www-browser
alternative and leave it broken on removal.

Andreas

unblock uzbl/0.0.0~git.20120514-1.1

diff -u uzbl-0.0.0~git.20120514/debian/changelog uzbl-0.0.0~git.20120514/debian/changelog
--- uzbl-0.0.0~git.20120514/debian/changelog
+++ uzbl-0.0.0~git.20120514/debian/changelog
@@ -1,3 +1,11 @@
+uzbl (0.0.0~git.20120514-1.1) unstable; urgency=low
+
+  * Non-maintainer upload with maintainer approval.
+  * Preserve x-www-browser alternative on upgrades.
+  * Remove x-www-browser alternative on uninstallation.  (Closes: #656222)
+
+ -- Andreas Beckmann <anbe@debian.org>  Mon, 28 Jan 2013 22:41:20 +0100
+
 uzbl (0.0.0~git.20120514-1) unstable; urgency=low
 
   * New upstream version
diff -u uzbl-0.0.0~git.20120514/debian/preinst uzbl-0.0.0~git.20120514/debian/preinst
--- uzbl-0.0.0~git.20120514/debian/preinst
+++ uzbl-0.0.0~git.20120514/debian/preinst
@@ -5,10 +5,6 @@
   rm -rf /usr/share/doc/uzbl/examples
 fi
 
-if [ "$1" = upgrade ]; then
-  update-alternatives --remove x-www-browser /usr/bin/uzbl-browser
-fi
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
only in patch2:
unchanged:
--- uzbl-0.0.0~git.20120514.orig/debian/prerm
+++ uzbl-0.0.0~git.20120514/debian/prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ]; then
+	update-alternatives --remove x-www-browser /usr/bin/uzbl-browser
+fi
+
+#DEBHELPER#