Followup-For: Bug #728427
Hi,
I'm attaching my patch that switches to dpkg-maintscript-helper to do
the dir_to_symlink conversion. It will require an updated debhelper
(#731723) since it uses $package.mainstcript files.
I haven't yet tested these packages against dpkg 1.17.5 and won't have
time to do so over the weekend.
Andreas
diff -Nru python-babel-1.3+dfsg.1/debian/changelog python-babel-1.3+dfsg.1/debian/changelog
--- python-babel-1.3+dfsg.1/debian/changelog 2013-12-06 15:56:06.000000000 +0100
+++ python-babel-1.3+dfsg.1/debian/changelog 2013-12-13 01:25:19.000000000 +0100
@@ -1,3 +1,10 @@
+python-babel (1.3+dfsg.1-3) UNRELEASED; urgency=low
+
+ * Really fix the directory to symlink conversion. (Closes: #728427)
+ Use dpkg-maintscript-helper dir_to_symlink which requires dpkg 1.17.5.
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 09 Dec 2013 01:53:02 +0100
+
python-babel (1.3+dfsg.1-2) unstable; urgency=low
* Fixes upgrade from 1.3-2 that was deleting files from the -localedata
diff -Nru python-babel-1.3+dfsg.1/debian/control python-babel-1.3+dfsg.1/debian/control
--- python-babel-1.3+dfsg.1/debian/control 2013-12-06 15:56:06.000000000 +0100
+++ python-babel-1.3+dfsg.1/debian/control 2013-12-09 02:50:27.000000000 +0100
@@ -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
diff -Nru python-babel-1.3+dfsg.1/debian/python-babel.maintscript python-babel-1.3+dfsg.1/debian/python-babel.maintscript
--- python-babel-1.3+dfsg.1/debian/python-babel.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ python-babel-1.3+dfsg.1/debian/python-babel.maintscript 2013-12-09 02:15:28.000000000 +0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/lib/python2.7/dist-packages/babel/localedata ../../../../share/python-babel-localedata/localedata 1.3+dfsg.1-3~
diff -Nru python-babel-1.3+dfsg.1/debian/python-babel.preinst python-babel-1.3+dfsg.1/debian/python-babel.preinst
--- python-babel-1.3+dfsg.1/debian/python-babel.preinst 2013-12-06 15:56:06.000000000 +0100
+++ python-babel-1.3+dfsg.1/debian/python-babel.preinst 1970-01-01 01:00:00.000000000 +0100
@@ -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
diff -Nru python-babel-1.3+dfsg.1/debian/python3-babel.maintscript python-babel-1.3+dfsg.1/debian/python3-babel.maintscript
--- python-babel-1.3+dfsg.1/debian/python3-babel.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ python-babel-1.3+dfsg.1/debian/python3-babel.maintscript 2013-12-09 02:19:03.000000000 +0100
@@ -0,0 +1 @@
+dir_to_symlink /usr/lib/python3/dist-packages/babel/localedata ../../../../share/python-babel-localedata/localedata 1.3+dfsg.1-3~
diff -Nru python-babel-1.3+dfsg.1/debian/python3-babel.preinst python-babel-1.3+dfsg.1/debian/python3-babel.preinst
--- python-babel-1.3+dfsg.1/debian/python3-babel.preinst 2013-12-06 15:56:06.000000000 +0100
+++ python-babel-1.3+dfsg.1/debian/python3-babel.preinst 1970-01-01 01:00:00.000000000 +0100
@@ -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
_______________________________________________
Python-modules-team mailing list
Python-modules-team@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team
