r2043 - in python-tz/trunk (8 files)
kobold at users.alioth.debian.org
kobold at users.alioth.debian.org
Wed Jan 27 17:57:31 UTC 2010
Date: Wednesday, January 27, 2010 @ 17:57:30
Author: kobold
Revision: 2043
New upstream release.
Added:
python-tz/trunk/debian/patches/
python-tz/trunk/debian/patches/series
python-tz/trunk/debian/patches/tzdata
Modified:
python-tz/trunk/debian/changelog
python-tz/trunk/debian/compat
python-tz/trunk/debian/control
python-tz/trunk/debian/rules
Deleted:
python-tz/trunk/pytz/
Modified: python-tz/trunk/debian/changelog
===================================================================
--- python-tz/trunk/debian/changelog 2010-01-27 17:22:41 UTC (rev 2042)
+++ python-tz/trunk/debian/changelog 2010-01-27 17:57:30 UTC (rev 2043)
@@ -1,3 +1,9 @@
+python-tz (2010b-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Wed, 27 Jan 2010 18:33:59 +0100
+
python-tz (2009u-1) unstable; urgency=low
* New upstream release.
Modified: python-tz/trunk/debian/compat
===================================================================
--- python-tz/trunk/debian/compat 2010-01-27 17:22:41 UTC (rev 2042)
+++ python-tz/trunk/debian/compat 2010-01-27 17:57:30 UTC (rev 2043)
@@ -1 +1 @@
-5
+7
Modified: python-tz/trunk/debian/control
===================================================================
--- python-tz/trunk/debian/control 2010-01-27 17:22:41 UTC (rev 2042)
+++ python-tz/trunk/debian/control 2010-01-27 17:57:30 UTC (rev 2043)
@@ -3,9 +3,7 @@
Priority: optional
Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.38)
-Build-Depends-Indep: python-all-dev (>= 2.3.5-9), python-central (>= 0.5)
-Build-Conflicts: python-setuptools
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4), quilt (>= 0.46-7)
Standards-Version: 3.8.3
Homepage: http://pypi.python.org/pypi/pytz/
XS-Python-Version: all
@@ -13,7 +11,10 @@
Package: python-tz
Architecture: all
-Depends: tzdata, ${python:Depends}
+Depends: tzdata, ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
+Recommends: ${pydeb:Recommends}
+Provides: ${pydeb:Provides}, ${python:Provides}
+Suggests: ${pydeb:Suggests}
XB-Python-Version: ${python:Versions}
Description: Python version of the Olson timezone database
python-tz brings the Olson tz database into Python. This library allows
Added: python-tz/trunk/debian/patches/series
===================================================================
--- python-tz/trunk/debian/patches/series (rev 0)
+++ python-tz/trunk/debian/patches/series 2010-01-27 17:57:30 UTC (rev 2043)
@@ -0,0 +1 @@
+tzdata
Added: python-tz/trunk/debian/patches/tzdata
===================================================================
--- python-tz/trunk/debian/patches/tzdata (rev 0)
+++ python-tz/trunk/debian/patches/tzdata 2010-01-27 17:57:30 UTC (rev 2043)
@@ -0,0 +1,22 @@
+--- pytz-2010b/pytz/__init__.py 2010-01-26 08:10:01.000000000 +0100
++++ ../trunk/pytz/__init__.py 2010-01-27 18:34:17.000000000 +0100
+@@ -50,17 +50,12 @@
+ Uses the pkg_resources module if available and no standard file
+ found at the calculated location.
+ """
++ # Patched in Debian, use the system zoninfo from the tzdata package
+ name_parts = name.lstrip('/').split('/')
+ for part in name_parts:
+ if part == os.path.pardir or os.path.sep in part:
+ raise ValueError('Bad path segment: %r' % part)
+- filename = os.path.join(os.path.dirname(__file__),
+- 'zoneinfo', *name_parts)
+- if not os.path.exists(filename) and resource_stream is not None:
+- # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+- # unless absolutely necessary to help when a broken version of
+- # pkg_resources is installed.
+- return resource_stream(__name__, 'zoneinfo/' + name)
++ filename = os.path.join('/usr/share/zoneinfo', *name_parts)
+ return open(filename, 'rb')
+
+
Modified: python-tz/trunk/debian/rules
===================================================================
--- python-tz/trunk/debian/rules 2010-01-27 17:22:41 UTC (rev 2042)
+++ python-tz/trunk/debian/rules 2010-01-27 17:57:30 UTC (rev 2043)
@@ -1,81 +1,11 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh --with pydeb --with python-central --with quilt $@
-PYVERS=$(shell pyversions -vr debian/control)
-PYMOD=pytz
-PACKAGE=python-tz
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
- | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
-
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
- py_sitename = site-packages
- py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-endif
-
-build: $(PYVERS:%=build-python%)
- touch $@
-build-python%:
- dh_testdir
- PYTHONPATH=$(CURDIR) python$* setup.py build
- touch $@
-
-.PHONY: clean
-clean:
- dh_testdir
- dh_testroot
- rm -f build-python?.?
- rm -rf build
- $(MAKE) -f debian/rules $(PYVERS:%=clean-python%)
- find -name '*.pyc' -exec rm {} \;
- dh_clean
-
-clean-python%:
- python$* setup.py clean
-
-.PHONY: install
-install:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) -f debian/rules $(PYVERS:%=install-python%)
+override_dh_install:
+ dh_install
# install our testing package
- install -D debian/test-pytz debian/$(PACKAGE)/usr/lib/python-tz/test-pytz.py
-
-install-python%:
- PYTHONPATH=$(CURDIR) python$* setup.py install --no-compile --root=debian/$(PACKAGE) $(py_setup_install_args)
+ 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/$(PACKAGE)$(call py_libdir,$*)/pytz/zoneinfo
-
-.PHONY: binary-common
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES.txt
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_pycentral
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-.PHONY: binary-indep
-binary-indep: install
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-.PHONY: binary-arch
-binary-arch:
-
-.PHONY: binary
-binary: binary-indep binary-arch
+ rm -rf debian/python-tz/usr/lib/python*/*-packages/pytz/zoneinfo
More information about the pkg-zope-developers
mailing list