[Python-modules-commits] r29468 - in packages/python-babel/trunk/debian (changelog rules)

[zigo at users.alioth.debian.org]

    Date: Tuesday, June 24, 2014 @ 07:06:36
  Author: zigo
Revision: 29468

Fixed removal of pyshared folder stuff (that directory doesn't exist anymore in Sid/Testing). This fixes FTBFS (Closes: #751056).

Modified:
  packages/python-babel/trunk/debian/changelog
  packages/python-babel/trunk/debian/rules

Modified: packages/python-babel/trunk/debian/changelog
===================================================================
--- packages/python-babel/trunk/debian/changelog	2014-06-23 15:46:27 UTC (rev 29467)
+++ packages/python-babel/trunk/debian/changelog	2014-06-24 07:06:36 UTC (rev 29468)
@@ -1,3 +1,10 @@
+python-babel (1.3+dfsg.1-4) unstable; urgency=medium
+
+  * Fixed removal of pyshared folder stuff (that directory doesn't exist
+    anymore in Sid/Testing). This fixes FTBFS (Closes: #751056).
+
+ -- Thomas Goirand <zigo at debian.org>  Tue, 24 Jun 2014 06:53:40 +0000
+
 python-babel (1.3+dfsg.1-3) unstable; urgency=medium
 
   * Uses an embedded copy of dir_to_symlink() from dpkg-maintscript-helper to

Modified: packages/python-babel/trunk/debian/rules
===================================================================
--- packages/python-babel/trunk/debian/rules	2014-06-23 15:46:27 UTC (rev 29467)
+++ packages/python-babel/trunk/debian/rules	2014-06-24 07:06:36 UTC (rev 29468)
@@ -37,9 +37,14 @@
 		rm debian/python-babel/usr/lib/python$$pyvers/dist-packages/babel/global.dat ; \
 		ln -s ../../../../share/python-babel-localedata/global.dat debian/python-babel/usr/lib/python$$pyvers/dist-packages/babel/global.dat ; \
 	done
-	rm debian/python-babel/usr/share/pyshared/babel/localedata/*.dat
-	rmdir debian/python-babel/usr/share/pyshared/babel/localedata
-	rm debian/python-babel/usr/share/pyshared/babel/global.dat
+	# Carefully remove an eventual /usr/share/pyshared/babel/localedata
+	# This doesn't exist in Sid / Jessie anymore, but it is still needed
+	# for backporting to Wheezy. Adding tests and -f fixes #751056 (eg: FTBFS)
+	set -e && if [ -d debian/python-babel/usr/share/pyshared/babel/localedata ] ; then \
+		rm -f debian/python-babel/usr/share/pyshared/babel/localedata/*.dat ; \
+		rmdir debian/python-babel/usr/share/pyshared/babel/localedata ; \
+		rm -f debian/python-babel/usr/share/pyshared/babel/global.dat ; \
+	fi
 
 override_dh_python3:
 	dh_python3 -O--buildsystem=python_distutils