[Python-modules-commits] r26259 - in packages/python-babel/trunk/debian (6 files)

[zigo at users.alioth.debian.org]

    Date: Wednesday, October 23, 2013 @ 05:27:52
  Author: zigo
Revision: 26259

Fixes the handling of alternatives removal (Closes: #726621)

Added:
  packages/python-babel/trunk/debian/python-babel.postrm
  packages/python-babel/trunk/debian/python3-babel.postrm
Modified:
  packages/python-babel/trunk/debian/changelog
  packages/python-babel/trunk/debian/python-babel.postinst
  packages/python-babel/trunk/debian/python-babel.prerm
  packages/python-babel/trunk/debian/python3-babel.prerm

Modified: packages/python-babel/trunk/debian/changelog
===================================================================
--- packages/python-babel/trunk/debian/changelog	2013-10-23 05:27:37 UTC (rev 26258)
+++ packages/python-babel/trunk/debian/changelog	2013-10-23 05:27:52 UTC (rev 26259)
@@ -1,6 +1,9 @@
 python-babel (1.3-2) UNRELEASED; urgency=low
 
   * Adds missing Replaces + Breaks in the doc package (Closes: #726043).
+  * Fixes the handling of alternatives removal, thanks to Andreas Beckmann
+    <anbe at debian.org> for his extensive explanations in his bug report
+    (Closes: #726621).
 
  -- Thomas Goirand <zigo at debian.org>  Wed, 23 Oct 2013 04:53:40 +0000
 

Modified: packages/python-babel/trunk/debian/python-babel.postinst
===================================================================
--- packages/python-babel/trunk/debian/python-babel.postinst	2013-10-23 05:27:37 UTC (rev 26258)
+++ packages/python-babel/trunk/debian/python-babel.postinst	2013-10-23 05:27:52 UTC (rev 26259)
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" = "configure" ] ; then
-	update-alternatives --install /usr/bin/pybabel pybabel /usr/bin/pybabel-python2 200
+	update-alternatives --install /usr/bin/pybabel pybabel /usr/bin/pybabel-python2 300
 fi
 
 #DEBHELPER#

Added: packages/python-babel/trunk/debian/python-babel.postrm
===================================================================
--- packages/python-babel/trunk/debian/python-babel.postrm	                        (rev 0)
+++ packages/python-babel/trunk/debian/python-babel.postrm	2013-10-23 05:27:52 UTC (rev 26259)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
+	update-alternatives --remove pybabel /usr/bin/pybabel-python2
+fi
+
+#DEBHELPER#

Modified: packages/python-babel/trunk/debian/python-babel.prerm
===================================================================
--- packages/python-babel/trunk/debian/python-babel.prerm	2013-10-23 05:27:37 UTC (rev 26258)
+++ packages/python-babel/trunk/debian/python-babel.prerm	2013-10-23 05:27:52 UTC (rev 26259)
@@ -2,8 +2,8 @@
 
 set -e
 
-if [ "$1" != "upgrade" ] ; then
-	update-alternatives --remove pybabel /usr/bin/waitress-serve-python2
+if [ "$1" = "remove" ] ; then
+	update-alternatives --remove pybabel /usr/bin/pybabel-python2
 fi
 
 #DEBHELPER#

Added: packages/python-babel/trunk/debian/python3-babel.postrm
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.postrm	                        (rev 0)
+++ packages/python-babel/trunk/debian/python3-babel.postrm	2013-10-23 05:27:52 UTC (rev 26259)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
+	update-alternatives --remove pybabel /usr/bin/pybabel-python3
+fi
+
+#DEBHELPER#

Modified: packages/python-babel/trunk/debian/python3-babel.prerm
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.prerm	2013-10-23 05:27:37 UTC (rev 26258)
+++ packages/python-babel/trunk/debian/python3-babel.prerm	2013-10-23 05:27:52 UTC (rev 26259)
@@ -2,8 +2,8 @@
 
 set -e
 
-if [ "$1" != "upgrade" ] ; then
-	update-alternatives --remove pybabel /usr/bin/waitress-serve-python3
+if [ "$1" = "remove" ] ; then
+	update-alternatives --remove pybabel /usr/bin/pybabel-python3
 fi
 
 #DEBHELPER#