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 2014-02-19 03:33:13.000000000 +0100 +++ python-babel-1.3+dfsg.1/debian/changelog 2014-05-18 11:26:57.000000000 +0200 @@ -1,3 +1,10 @@ +python-babel (1.3+dfsg.1-3ubuntu1) utopic; urgency=low + + * Merge from Debian unstable (lp: #1320612). Remaining changes: + - Don't try to remove files in debian/rules which aren't there anymore. + + -- Michael Bienia Sun, 18 May 2014 11:26:46 +0200 + python-babel (1.3+dfsg.1-3) unstable; urgency=medium * Uses an embedded copy of dir_to_symlink() from dpkg-maintscript-helper to @@ -20,6 +27,12 @@ -- Andreas Beckmann Sun, 19 Jan 2014 00:40:32 +0100 +python-babel (1.3+dfsg.1-2ubuntu1) trusty; urgency=medium + + * Don't touch pyshared in debian/rules. + + -- Matthias Klose Wed, 15 Jan 2014 07:38:16 +0100 + python-babel (1.3+dfsg.1-2) unstable; urgency=low * Fixes upgrade from 1.3-2 that was deleting files from the -localedata @@ -177,3 +190,4 @@ * Initial release (Closes: #461087) -- Christoph Haas Wed, 16 Jan 2008 15:35:18 +0100 + 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 2014-02-18 12:39:46.000000000 +0100 +++ python-babel-1.3+dfsg.1/debian/control 2014-05-18 11:19:22.000000000 +0200 @@ -1,7 +1,8 @@ Source: python-babel Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Christoph Haas , Thomas Goirand Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3), diff -Nru python-babel-1.3+dfsg.1/debian/rules python-babel-1.3+dfsg.1/debian/rules --- python-babel-1.3+dfsg.1/debian/rules 2014-02-19 03:23:13.000000000 +0100 +++ python-babel-1.3+dfsg.1/debian/rules 2014-02-26 11:10:22.000000000 +0100 @@ -37,9 +37,6 @@ 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 override_dh_python3: dh_python3 -O--buildsystem=python_distutils