tag 416204 patch upstream confirmed forwarded 416204 [EMAIL PROTECTED] user [EMAIL PROTECTED] usertag 416204 + origin-ubuntu ubuntu-patch intrepid thanks
Hello Guido, Kurt Roeckx [2007-03-25 22:28 +0200]: > We already have an up-to-date version of this in the tzdata package. > It would be nice if we only had 1 package providing this so we only need > to update 1 package. Exactly. Here is a debdiff I just uploaded to Ubuntu (sent Gustavo a mail with the patch, too). In addition to looking in /usr/share/zoneinfo and dropping the .tar.gz from the deb, it also enables running the test suite during build. Please consider doing this as well. Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -u python-dateutil-1.4/debian/patches/series python-dateutil-1.4/debian/patches/series --- python-dateutil-1.4/debian/patches/series +++ python-dateutil-1.4/debian/patches/series @@ -1,0 +2 @@ +system_tzdata.diff diff -u python-dateutil-1.4/debian/changelog python-dateutil-1.4/debian/changelog --- python-dateutil-1.4/debian/changelog +++ python-dateutil-1.4/debian/changelog @@ -1,3 +1,13 @@ +python-dateutil (1.4-1ubuntu1) intrepid; urgency=low + + * debian/patches/system_tzdata.diff: Use system tzdata instead of builtin + obsolete copy of the Olson timezone database. (LP #271680, Debian #416204) + * debian/rules: Do not ship the obsolete tzdata tarball. + * debian/rules: Run the test suite during build, have it fail the build if + it fails. + + -- Martin Pitt <[EMAIL PROTECTED]> Mon, 29 Sep 2008 12:07:52 +0200 + python-dateutil (1.4-1) unstable; urgency=low * new upstream version diff -u python-dateutil-1.4/debian/rules python-dateutil-1.4/debian/rules --- python-dateutil-1.4/debian/rules +++ python-dateutil-1.4/debian/rules @@ -12,0 +13,7 @@ + +common-build-indep:: + # run test suite + ./test.py + +binary-post-install/python-dateutil:: + find debian/$(cdbs_curpkg) -name 'zoneinfo*.tar.gz' | xargs rm -v only in patch2: unchanged: --- python-dateutil-1.4.orig/debian/patches/system_tzdata.diff +++ python-dateutil-1.4/debian/patches/system_tzdata.diff @@ -0,0 +1,39 @@ +# Description: Prefer using the system tzdata information instead of +# the shipped obsolete copy. +# Ubuntu: https://bugs.launchpad.net/bugs/271680 +# Debian: http://bugs.debian.org/416204 +# Upstream: sent via email +Index: python-dateutil-1.4/dateutil/zoneinfo/__init__.py +=================================================================== +--- python-dateutil-1.4.orig/dateutil/zoneinfo/__init__.py 2008-09-29 11:56:02.000000000 +0200 ++++ python-dateutil-1.4/dateutil/zoneinfo/__init__.py 2008-09-29 11:59:46.000000000 +0200 +@@ -40,11 +40,13 @@ + + def gettz(name): + tzinfo = None +- if ZONEINFOFILE: +- for cachedname, tzinfo in CACHE: +- if cachedname == name: +- break +- else: ++ for cachedname, tzinfo in CACHE: ++ if cachedname == name: ++ break ++ else: ++ if os.path.exists('/usr/share/zoneinfo/' + name): ++ tzinfo = tzfile('/usr/share/zoneinfo/' + name) ++ elif ZONEINFOFILE: + tf = TarFile.open(ZONEINFOFILE) + try: + zonefile = tf.extractfile(name) +@@ -53,8 +55,8 @@ + else: + tzinfo = tzfile(zonefile) + tf.close() +- CACHE.insert(0, (name, tzinfo)) +- del CACHE[CACHESIZE:] ++ CACHE.insert(0, (name, tzinfo)) ++ del CACHE[CACHESIZE:] + return tzinfo + + def rebuild(filename, tag=None, format="gz"):
signature.asc
Description: Digital signature
