r1207 - in python-tz/trunk (10 files)
Fabio Tranchitella
kobold at alioth.debian.org
Wed Mar 19 08:03:08 UTC 2008
Date: Wednesday, March 19, 2008 @ 08:03:08
Author: kobold
Revision: 1207
[svn-inject] Applying Debian modifications to trunk
Added:
python-tz/trunk/debian/
python-tz/trunk/debian/changelog
python-tz/trunk/debian/compat
python-tz/trunk/debian/control
python-tz/trunk/debian/copyright
python-tz/trunk/debian/docs
python-tz/trunk/debian/rules
python-tz/trunk/debian/test-pytz
python-tz/trunk/debian/watch
Modified:
python-tz/trunk/pytz/__init__.py
Property changes on: python-tz/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: python-tz/trunk/debian/changelog
===================================================================
--- python-tz/trunk/debian/changelog (rev 0)
+++ python-tz/trunk/debian/changelog 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1,76 @@
+python-tz (2007d-1) unstable; urgency=low
+
+ * New upstream release (Closes: 415458)
+ * Revert patch ignoring arch files, it's not necessary any and conflicted
+ with upstream.
+ * Patch upstream to use /usr/share/zoneinfo and remove the included version,
+ also depend on tzdata package. (Closes: 416202)
+ * Write and install a testrunner that can run the pytz tests in
+ /usr/lib/python-tz/test-pytxX.Y which tests pythonX.Y.
+ * Build depends on python-central > 0.5, debhelper > 5.0.38
+ * Remove workaround for python-central/debhelper breakage.
+
+ -- Brian Sutherland <jinty at web.de> Wed, 9 May 2007 12:01:36 +0200
+
+python-tz (2006p-0.2) unstable; urgency=low
+
+ * Fix watch file to look at the python cheeseshop.
+
+ -- Brian Sutherland <brian at vanguardistas.net> Sun, 6 May 2007 23:30:49 +0200
+
+python-tz (2006p-0.1) unstable; urgency=low
+
+ * NMU.
+ * New upstream version, matching the version of the tzdata package.
+
+ -- Matthias Klose <doko at debian.org> Sun, 7 Jan 2007 11:42:00 +0100
+
+python-tz (2006g-1) unstable; urgency=low
+
+ * New upstream version.
+ * Update to new python policy using python-central (Closes: #373361)
+
+ -- Brian Sutherland <jinty at web.de> Wed, 14 Jun 2006 17:54:32 +0200
+
+python-tz (2005r-1) unstable; urgency=low
+
+ * New upstream version.
+ * Update watchfile to use qa.debian.org's re-director.
+ * Bump standards version to 3.6.2.
+
+ -- Brian Sutherland <jinty at web.de> Sun, 1 Jan 2006 20:29:56 +0100
+
+python-tz (2005m-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Brian Sutherland <jinty at web.de> Thu, 15 Sep 2005 14:45:50 +0200
+
+python-tz (2005k-1) unstable; urgency=low
+
+ * New upsteam version.
+ * Debian specific patch removing extraneous she-bangs removed as it was
+ accepted upstream.
+
+ -- Brian Sutherland <jinty at web.de> Mon, 5 Sep 2005 00:34:10 +0200
+
+python-tz (2005i-2) unstable; urgency=low
+
+ * Build python2.4 library so that the zope3-lib can depend on it, see
+ #317742.
+ * Replaces zope3-lib.
+ * Patch setup.py to ignore .arch-ids directories.
+
+ -- Brian Sutherland <jinty at web.de> Fri, 29 Jul 2005 00:01:54 +0200
+
+python-tz (2005i-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Brian Sutherland <jinty at web.de> Tue, 31 May 2005 18:02:23 +0200
+
+python-tz (2005a-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Brian Sutherland <jinty at web.de> Tue, 8 Feb 2005 02:14:33 +0100
Added: python-tz/trunk/debian/compat
===================================================================
--- python-tz/trunk/debian/compat (rev 0)
+++ python-tz/trunk/debian/compat 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1 @@
+4
Added: python-tz/trunk/debian/control
===================================================================
--- python-tz/trunk/debian/control (rev 0)
+++ python-tz/trunk/debian/control 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1,24 @@
+Source: python-tz
+Section: python
+Priority: extra
+Maintainer: Brian Sutherland <jinty at web.de>
+Build-Depends: debhelper (>= 5.0.38)
+Build-Depends-Indep: python-all-dev (>= 2.3.5-9), python-central (>= 0.5), python-setuptools (>= 0.6b3)
+Standards-Version: 3.7.2
+XS-Python-Version: all
+
+Package: python-tz
+Architecture: all
+Depends: tzdata, ${python:Depends}
+Provides: ${python:Provides}
+Conflicts: python2.3-tz (<< 2006g-1), python2.4-tz (<< 2006g-1)
+Replaces: python2.3-tz (<< 2006g-1), python2.4-tz (<< 2006g-1)
+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
+ accurate and cross platform timezone calculations using Python 2.3 or higher.
+ It also solves the issue of ambiguous times at the end of daylight savings,
+ which you can read more about in the Python Library Reference
+ (datetime.tzinfo).
+ .
+ Homepage: http://pytz.sourceforge.net/
Added: python-tz/trunk/debian/copyright
===================================================================
--- python-tz/trunk/debian/copyright (rev 0)
+++ python-tz/trunk/debian/copyright 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1,60 @@
+This package was debianized by Brian Sutherland <jinty at web.de> on
+Tue, 8 Feb 2005 02:14:33 +0100.
+
+It was downloaded from http://sourceforge.net/projects/pytz/.
+
+Copyright:
+
+Upstream Author: Stuart Bishop <stuart at stuartbishop.net>
+
+This package is the result of an automatic generation from the Olsen database
+(available from ftp://elsie.nci.nih.gov/pub). This means that there are two
+licenses involved, that of the original distribution and the automatic
+generation code. Fortunately both are BSD style.
+
+Both are included here as they are quite different from the standard BSD style
+license distributed with Debian.
+
+
+License:
+
+The files of the original database distribution contain this license text:
+
+/*
+** Copyright (c) 1989 The Regents of the University of California.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms are permitted
+** provided that the above copyright notice and this paragraph are
+** duplicated in all such forms and that any documentation,
+** advertising materials, and other materials related to such
+** distribution and use acknowledge that the software was developed
+** by the University of California, Berkeley. The name of the
+** University may not be used to endorse or promote products derived
+** from this software without specific prior written permission.
+** THIS SOFTWARE IS PROVIDED ``AS IS' AND WITHOUT ANY EXPRESS OR
+** IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+And the automatic generation code license is:
+
+Copyright (c) 2003-2005 Stuart Bishop <stuart at stuartbishop.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.
Added: python-tz/trunk/debian/docs
===================================================================
--- python-tz/trunk/debian/docs (rev 0)
+++ python-tz/trunk/debian/docs 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1,3 @@
+CHANGES.txt
+README.txt
+PKG-INFO
Added: python-tz/trunk/debian/rules
===================================================================
--- python-tz/trunk/debian/rules (rev 0)
+++ python-tz/trunk/debian/rules 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1,81 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+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)
+
+build: $(PYVERS:%=build-python%)
+ touch $@
+build-python%:
+ dh_testdir
+ 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%)
+
+install-python%:
+ python$* setup.py install --no-compile --single-version-externally-managed --root=debian/$(PACKAGE)
+ # Remove python and module version from .egg-info
+ mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info \
+ debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD).egg-info
+ # remove zoneinfo, our patch to pytz makes it use the one from tzdata
+ rm -rf debian/$(PACKAGE)/usr/lib/python$*/site-packages/pytz/zoneinfo
+ # install our testing package
+ install -D debian/test-pytz \
+ debian/$(PACKAGE)/usr/lib/python-tz/test-pytz$*
+ sed -i 's/@PYVERSION@/$*/' debian/$(PACKAGE)/usr/lib/python-tz/test-pytz$*
+
+.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: install
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+.PHONY: binary
+binary: binary-indep binary-arch
Property changes on: python-tz/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: python-tz/trunk/debian/test-pytz
===================================================================
--- python-tz/trunk/debian/test-pytz (rev 0)
+++ python-tz/trunk/debian/test-pytz 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1,17 @@
+#!/usr/bin/python at PYVERSION@
+"""Run to test the system python"""
+import doctest
+import pytz
+import pytz.tzinfo
+import sys
+
+errors = 0
+tests = 0
+for mod in [pytz, pytz.tzinfo]:
+ mod_errors, mod_tests = doctest.testmod(mod)
+ errors += mod_errors
+ tests += mod_tests
+
+if not errors:
+ print "Ran %s tests successfully." % tests
+sys.exit(errors)
Added: python-tz/trunk/debian/watch
===================================================================
--- python-tz/trunk/debian/watch (rev 0)
+++ python-tz/trunk/debian/watch 2008-03-19 08:03:08 UTC (rev 1207)
@@ -0,0 +1,2 @@
+version=3
+http://cheeseshop.python.org/pypi/pytz/ http://cheeseshop.python.org/packages/source/p/pytz/pytz-(.*).tar.gz#md5=.*
Modified: python-tz/trunk/pytz/__init__.py
===================================================================
--- python-tz/trunk/pytz/__init__.py 2008-03-19 08:03:00 UTC (rev 1206)
+++ python-tz/trunk/pytz/__init__.py 2008-03-19 08:03:08 UTC (rev 1207)
@@ -45,16 +45,13 @@
Uses the pkg_resources module if available.
"""
- if resource_stream is not None:
- return resource_stream(__name__, 'zoneinfo/' + name)
- else:
- 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)
- return open(filename, 'rb')
+ # 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('/usr/share/zoneinfo', *name_parts)
+ return open(filename, 'rb')
# Enable this when we get some translations?
More information about the pkg-zope-commits
mailing list