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

[zigo at users.alioth.debian.org]

    Date: Saturday, January 25, 2014 @ 08:07:57
  Author: zigo
Revision: 27423

Applies patch from Andrea Beckman NMU:
  * Non-maintainer upload.
  * Really fix the directory to symlink conversion.  (Closes: #728427)
    Use dpkg-maintscript-helper dir_to_symlink which requires dpkg 1.17.5.

Added:
  packages/python-babel/trunk/debian/python-babel.maintscript
  packages/python-babel/trunk/debian/python3-babel.maintscript
Modified:
  packages/python-babel/trunk/debian/changelog
  packages/python-babel/trunk/debian/control
Deleted:
  packages/python-babel/trunk/debian/python-babel.preinst
  packages/python-babel/trunk/debian/python3-babel.preinst

Modified: packages/python-babel/trunk/debian/changelog
===================================================================
--- packages/python-babel/trunk/debian/changelog	2014-01-25 06:46:59 UTC (rev 27422)
+++ packages/python-babel/trunk/debian/changelog	2014-01-25 08:07:57 UTC (rev 27423)
@@ -1,3 +1,11 @@
+python-babel (1.3+dfsg.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Really fix the directory to symlink conversion.  (Closes: #728427)
+    Use dpkg-maintscript-helper dir_to_symlink which requires dpkg 1.17.5.
+
+ -- Andreas Beckmann <anbe at debian.org>  Sun, 19 Jan 2014 00:40:32 +0100
+
 python-babel (1.3+dfsg.1-2) unstable; urgency=low
 
   * Fixes upgrade from 1.3-2 that was deleting files from the -localedata

Modified: packages/python-babel/trunk/debian/control
===================================================================
--- packages/python-babel/trunk/debian/control	2014-01-25 06:46:59 UTC (rev 27422)
+++ packages/python-babel/trunk/debian/control	2014-01-25 08:07:57 UTC (rev 27423)
@@ -31,6 +31,7 @@
 
 Package: python-babel
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: python-babel-localedata (= ${source:Version}), python-pkg-resources, ${misc:Depends}, ${python:Depends}
 Recommends: ${python:Recommends}
 Description: tools for internationalizing Python applications - Python 2.x
@@ -43,6 +44,7 @@
 
 Package: python3-babel
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: python-babel-localedata (= ${source:Version}), python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
 Recommends: ${python3:Recommends}
 Description: tools for internationalizing Python applications - Python 3.x

Added: packages/python-babel/trunk/debian/python-babel.maintscript
===================================================================
--- packages/python-babel/trunk/debian/python-babel.maintscript	                        (rev 0)
+++ packages/python-babel/trunk/debian/python-babel.maintscript	2014-01-25 08:07:57 UTC (rev 27423)
@@ -0,0 +1 @@
+dir_to_symlink /usr/lib/python2.7/dist-packages/babel/localedata ../../../../share/python-babel-localedata/localedata 1.3+dfsg.1-2.1~

Deleted: packages/python-babel/trunk/debian/python-babel.preinst
===================================================================
--- packages/python-babel/trunk/debian/python-babel.preinst	2014-01-25 06:46:59 UTC (rev 27422)
+++ packages/python-babel/trunk/debian/python-babel.preinst	2014-01-25 08:07:57 UTC (rev 27423)
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "${1}" = "upgrade" ] ; then
-	# 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
-			find $i/dist-packages/babel/localedata -maxdepth 1 -type l -name '*.dat' -delete
-			rmdir $i/dist-packages/babel/localedata
-		fi
-	done
-fi
-
-#DEBHELPER#
-
-exit 0

Added: packages/python-babel/trunk/debian/python3-babel.maintscript
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.maintscript	                        (rev 0)
+++ packages/python-babel/trunk/debian/python3-babel.maintscript	2014-01-25 08:07:57 UTC (rev 27423)
@@ -0,0 +1 @@
+dir_to_symlink /usr/lib/python3/dist-packages/babel/localedata ../../../../share/python-babel-localedata/localedata 1.3+dfsg.1-2.1~

Deleted: packages/python-babel/trunk/debian/python3-babel.preinst
===================================================================
--- packages/python-babel/trunk/debian/python3-babel.preinst	2014-01-25 06:46:59 UTC (rev 27422)
+++ packages/python-babel/trunk/debian/python3-babel.preinst	2014-01-25 08:07:57 UTC (rev 27423)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-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
-		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
-
-#DEBHELPER#
-
-exit 0