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

[zigo at users.alioth.debian.org]

    Date: Sunday, December 1, 2013 @ 05:42:02
  Author: zigo
Revision: 26625

Fixes upgrade from 1.3-2 that was deleting files from the -localedata folder (Closes: #728427).

Modified:
  packages/python-babel/trunk/debian/changelog
  packages/python-babel/trunk/debian/python-babel.preinst
  packages/python-babel/trunk/debian/python3-babel.preinst
  packages/python-babel/trunk/debian/rules

Modified: packages/python-babel/trunk/debian/changelog
===================================================================
--- packages/python-babel/trunk/debian/changelog	2013-11-30 16:10:14 UTC (rev 26624)
+++ packages/python-babel/trunk/debian/changelog	2013-12-01 05:42:02 UTC (rev 26625)
@@ -1,3 +1,10 @@
+python-babel (1.3+dfsg.1-2) unstable; urgency=low
+
+  * Fixes upgrade from 1.3-2 that was deleting files from the -localedata
+    folder (Closes: #728427).
+
+ -- Thomas Goirand <zigo at debian.org>  Thu, 21 Nov 2013 16:23:56 +0000
+
 python-babel (1.3+dfsg.1-1) unstable; urgency=low
 
   * Updates the VCS fields URLs.

Modified: packages/python-babel/trunk/debian/python-babel.preinst
===================================================================
--- packages/python-babel/trunk/debian/python-babel.preinst	2013-11-30 16:10:14 UTC (rev 26624)
+++ packages/python-babel/trunk/debian/python-babel.preinst	2013-12-01 05:42:02 UTC (rev 26625)
@@ -6,7 +6,7 @@
 	# What's below is needed for upgrading from packages before localedata was in an independent python-babel-localedata package.
 	for i in /usr/lib/python2.* ; do
 		if [ ! -h $i/dist-packages/babel/localedata ] && [ -d $i/dist-packages/babel/localedata ] ; then
-			rm -f $i/dist-packages/babel/localedata/*.dat
+			find $i/dist-packages/babel/localedata -maxdepth 1 -type l -name '*.dat' -delete
 			rmdir $i/dist-packages/babel/localedata
 		fi
 	done

Modified: packages/python-babel/trunk/debian/python3-babel.preinst
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.preinst	2013-11-30 16:10:14 UTC (rev 26624)
+++ packages/python-babel/trunk/debian/python3-babel.preinst	2013-12-01 05:42:02 UTC (rev 26625)
@@ -5,7 +5,8 @@
 if [ "${1}" = "upgrade" ] ; then
 	# What's below is needed for upgrading from packages before localedata was in an independent python-babel-localedata package.
 	if [ ! -h /usr/lib/python3/dist-packages/babel/localedata ] && [ -d /usr/lib/python3/dist-packages/babel/localedata ]; then
-		rm -f /usr/lib/python3/dist-packages/babel/localedata/*.dat
+		find /usr/lib/python3/dist-packages/babel/localedata -maxdepth 1 -type f -name '*.dat' -delete
+		find /usr/lib/python3/dist-packages/babel/localedata -maxdepth 1 -type l -name '*.dat' -delete
 		rmdir /usr/lib/python3/dist-packages/babel/localedata
 	fi
 fi

Modified: packages/python-babel/trunk/debian/rules
===================================================================
--- packages/python-babel/trunk/debian/rules	2013-11-30 16:10:14 UTC (rev 26624)
+++ packages/python-babel/trunk/debian/rules	2013-12-01 05:42:02 UTC (rev 26625)
@@ -65,9 +65,7 @@
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version
 
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#	set -e; \
-#	for python in $(PYVERS); do  \
-#		$$python setup.py test -vv; \
-#	done
+#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+#override_dh_auto_test:
+#	py.test tests
 #endif