Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package python-tz RC bug fix. Note: The debdiff does not include the non-free files that were removed. They were already not included in the binary (and not used), so all that needed fixing was removing them from the source as well. Including them made the diff a lot longer and less readable without providing any useful information. unblock python-tz/2012c+dfsg-0.1 -- System Information: Debian Release: jessie/sid APT prefers trusty-updates APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty'), (100, 'trusty-backports') Architecture: i386 (x86_64) Foreign Architectures: amd64 Kernel: Linux 3.13.0-39-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru python-tz-2012c/debian/changelog python-tz-2012c+dfsg/debian/changelog --- python-tz-2012c/debian/changelog 2012-06-07 09:07:14.000000000 -0400 +++ python-tz-2012c+dfsg/debian/changelog 2014-11-13 21:12:13.000000000 -0500 @@ -1,3 +1,14 @@ +python-tz (2012c+dfsg-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * Repack without zoneinfo files. (Closes: #714346) + + Add pytz/zoneinfo to Files-Excluded in d/copyright. + + Add dversionmangle to d/watch. + + Patch setup.py to not install zoneinfo files. + + Remove removal of zoneinfo files from d/rules. + + -- Helmut Grohne <hel...@subdivi.de> Wed, 12 Nov 2014 22:19:38 +0100 + python-tz (2012c-1) unstable; urgency=low * Team upload. diff -Nru python-tz-2012c/debian/copyright python-tz-2012c+dfsg/debian/copyright --- python-tz-2012c/debian/copyright 2012-06-07 08:54:00.000000000 -0400 +++ python-tz-2012c+dfsg/debian/copyright 2014-11-13 21:10:50.000000000 -0500 @@ -2,6 +2,7 @@ Upstream-Name: pytz Upstream-Contact: Stuart Bishop <stu...@stuartbishop.net> Source: http://pypi.python.org/pypi/pytz/ +Files-Excluded: pytz/zoneinfo/* Files: * Copyright: (c) 2003-2009 Stuart Bishop <stu...@stuartbishop.net> @@ -23,8 +24,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Files: pytz/zoneinfo/* -Copyright: Arthur David Olson et.al. <t...@elsie.nci.nih.gov> -License: public-domain -Comment: excluded from binary package diff -Nru python-tz-2012c/debian/patches/tzdata python-tz-2012c+dfsg/debian/patches/tzdata --- python-tz-2012c/debian/patches/tzdata 2012-06-05 22:20:09.000000000 -0400 +++ python-tz-2012c+dfsg/debian/patches/tzdata 2014-11-13 21:10:50.000000000 -0500 @@ -2,11 +2,12 @@ Author: Kurt Roeckx <k...@roeckx.be> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=416202 Forwarded: not-needed +Last-Update: 2014-11-12 -Index: pytz-2011h/pytz/__init__.py +Index: python-tz-2012c+dfsg/pytz/__init__.py =================================================================== ---- pytz-2011h.orig/pytz/__init__.py 2011-10-21 15:14:54.048406509 +0900 -+++ pytz-2011h/pytz/__init__.py 2011-10-21 15:14:57.232406629 +0900 +--- python-tz-2012c+dfsg.orig/pytz/__init__.py 2012-04-16 06:42:39.000000000 +0200 ++++ python-tz-2012c+dfsg/pytz/__init__.py 2014-11-12 22:11:59.000000000 +0100 @@ -31,11 +31,6 @@ except ImportError: from collections import Mapping as DictMixin @@ -39,11 +40,11 @@ return open(filename, 'rb') -Index: pytz-2011h/pytz/tzfile.py +Index: python-tz-2012c+dfsg/pytz/tzfile.py =================================================================== ---- pytz-2011h.orig/pytz/tzfile.py 2011-06-27 22:48:49.000000000 +0900 -+++ pytz-2011h/pytz/tzfile.py 2011-10-21 15:16:11.116409439 +0900 -@@ -125,7 +125,8 @@ +--- python-tz-2012c+dfsg.orig/pytz/tzfile.py 2012-04-16 06:42:39.000000000 +0200 ++++ python-tz-2012c+dfsg/pytz/tzfile.py 2014-11-12 22:11:59.000000000 +0100 +@@ -127,7 +127,8 @@ if __name__ == '__main__': import os.path from pprint import pprint @@ -53,3 +54,23 @@ tz = build_tzinfo('Australia/Melbourne', open(os.path.join(base,'Australia','Melbourne'), 'rb')) tz = build_tzinfo('US/Eastern', +Index: python-tz-2012c+dfsg/setup.py +=================================================================== +--- python-tz-2012c+dfsg.orig/setup.py 2012-04-16 06:42:39.000000000 +0200 ++++ python-tz-2012c+dfsg/setup.py 2014-11-12 22:42:37.000000000 +0100 +@@ -13,15 +13,8 @@ + memail = 'stu...@stuartbishop.net' + packages = ['pytz'] + resources = ['zone.tab', 'locales/pytz.pot'] +-for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')): +- # remove the 'pytz' part of the path +- basepath = dirpath.split(os.path.sep, 1)[1] +- resources.extend([os.path.join(basepath, filename) +- for filename in filenames]) + package_data = {'pytz': resources} + +-assert len(resources) > 10, 'zoneinfo files not found!' +- + setup ( + name='pytz', + version=pytz.VERSION, diff -Nru python-tz-2012c/debian/rules python-tz-2012c+dfsg/debian/rules --- python-tz-2012c/debian/rules 2011-10-21 03:05:23.000000000 -0400 +++ python-tz-2012c+dfsg/debian/rules 2014-11-13 21:10:50.000000000 -0500 @@ -35,6 +35,3 @@ # install our testing package install -D debian/test-pytz debian/python-tz/usr/lib/python-tz/test-pytz.py - - # remove zoneinfo, our patch to pytz makes it use the one from tzdata - rm -rf debian/python*-tz/usr/lib/python*/*-packages/pytz/zoneinfo diff -Nru python-tz-2012c/debian/watch python-tz-2012c+dfsg/debian/watch --- python-tz-2012c/debian/watch 2011-10-21 01:54:27.000000000 -0400 +++ python-tz-2012c+dfsg/debian/watch 2014-11-13 21:10:50.000000000 -0500 @@ -1,2 +1,3 @@ version=3 -http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz +opts=dversionmangle=s/\+dfsg\d*$// \ + http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz
