Merge lp:~ubuntu-branches/ubuntu/precise/python-dateutil/precise-201110191810 into lp:ubuntu/precise/python-dateutil

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/python-dateutil reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/python-dateutil/precise-201110191810. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

11. By Barry Warsaw on 2011-07-18

* [1cda493] Switch to dh_python2 (Closes: #633888) (LP: #788514)
* [22c75cc] Bump standard version
* [7acb296] Depend on python-all since we don't ship arch any packages

10. By Barry Warsaw on 2011-07-14

Switch to dh_python2. (LP: #788514)

9. By Guido Günther on 2009-02-24

* [95a66ef] depend on tzdata and update description
* [93fe8b9] don't depend on pysupport internals (Closes: #516907) -
  thanks to Josselin Mouette for pointing this out and providing a fix

8. By Guido Günther on 2008-09-30

* [a5de481] don't ship timezone information (Closes: #416204)
* [4f4aa5d] add README.source
* [174ea3e] bump standards version

7. By Martin Pitt on 2008-09-29

* Drop system_tzdata.diff again, it is not necessary. It didn't patch the
  official API to get tz information, but the subclass whose only purpose is
  to look up the files in the shipped tarball. Just keep not shipping the
  tarball in the built package.
* Add dependency to tzdata.

6. By Martin Pitt on 2008-09-29

* 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.

5. By Guido Günther on 2008-03-12

* new upstream version
* add watch file from dehs.debian.org
* build-depend on python-setuptools

4. By Guido Günther on 2007-12-10

New Upstream Version

3. By Guido Günther on 2007-08-05

New Upstream Version

=== modified file 'NEWS'
--- NEWS	2011-08-30 22:20:22 +0000
+++ NEWS	2011-10-19 18:15:28 +0000
@@ -1,3 +1,61 @@
+Version 1.4.1
+-------------
+
+- Updated timezone information.
+
+
+Version 1.4
+-----------
+
+- Fixed another parser precision problem on conversion of decimal seconds
+  to microseconds, as reported by Erik Brown.  Now these issues are gone
+  for real since it's not using floating point arithmetic anymore.
+
+- Fixed case where tzrange.utcoffset and tzrange.dst() might fail due
+  to a date being used where a datetime was expected (reported and fixed
+  by Lennart Regebro).
+
+- Prevent tzstr from introducing daylight timings in strings that didn't
+  specify them (reported by Lennart Regebro).
+
+- Calls like gettz("GMT+3") and gettz("UTC-2") will now return the
+  expected values, instead of the TZ variable behavior.
+
+- Fixed DST signal handling in zoneinfo files.  Reported by
+  Nicholas F. Fabry and John-Mark Gurney.
+
+
+Version 1.3
+-----------
+
+- Fixed precision problem on conversion of decimal seconds to
+  microseconds, as reported by Skip Montanaro.
+
+- Fixed bug in constructor of parser, and converted parser classes to
+  new-style classes.  Original report and patch by Michael Elsdörfer.
+
+- Initialize tzid and comps in tz.py, to prevent the code from ever
+  raising a NameError (even with broken files).  Johan Dahlin suggested
+  the fix after a pyflakes run.
+
+- Version is now published in dateutil.__version__, as requested
+  by Darren Dale.
+
+- All code is compatible with new-style division.
+
+
+Version 1.2
+-----------
+
+- Now tzfile will round timezones to full-minutes if necessary,
+  since Python's datetime doesn't support sub-minute offsets.
+  Thanks to Ilpo Nyyssönen for reporting the issue.
+
+- Removed bare string exceptions, as reported and fixed by
+  Wilfredo Sánchez Vega.
+
+- Fix bug in leap count parsing (reported and fixed by Eugene Oden).
+
 
 Version 1.5
 -----------

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-08-30 22:20:22 +0000
+++ PKG-INFO	2011-10-19 18:15:28 +0000
@@ -1,6 +1,10 @@
 Metadata-Version: 1.0
 Name: python-dateutil
+<<<<<<< TREE
 Version: 1.5
+=======
+Version: 1.4.1
+>>>>>>> MERGE-SOURCE
 Summary: Extensions to the standard python 2.3+ datetime module
 Home-page: http://labix.org/python-dateutil
 Author: Gustavo Niemeyer

=== modified file 'dateutil/__init__.py'
--- dateutil/__init__.py	2011-08-30 22:20:22 +0000
+++ dateutil/__init__.py	2011-10-19 18:15:28 +0000
@@ -1,9 +1,17 @@
 """
+<<<<<<< TREE
 Copyright (c) 2003-2010  Gustavo Niemeyer <[e-mail]>
+=======
+Copyright (c) 2003-2007  Gustavo Niemeyer <[e-mail]>
+>>>>>>> MERGE-SOURCE
 
 This module offers extensions to the standard python 2.3+
 datetime module.
 """
 __author__ = "Gustavo Niemeyer <[e-mail]>"
 __license__ = "PSF License"
+<<<<<<< TREE
 __version__ = "1.5"
+=======
+__version__ = "1.4.1"
+>>>>>>> MERGE-SOURCE

=== modified file 'dateutil/relativedelta.py'
--- dateutil/relativedelta.py	2011-08-30 22:20:22 +0000
+++ dateutil/relativedelta.py	2011-10-19 18:15:28 +0000
@@ -1,5 +1,9 @@
 """
+<<<<<<< TREE
 Copyright (c) 2003-2010  Gustavo Niemeyer <[e-mail]>
+=======
+Copyright (c) 2003-2007  Gustavo Niemeyer <[e-mail]>
+>>>>>>> MERGE-SOURCE
 
 This module offers extensions to the standard python 2.3+
 datetime module.

=== modified file 'dateutil/rrule.py'
--- dateutil/rrule.py	2011-08-30 22:20:22 +0000
+++ dateutil/rrule.py	2011-10-19 18:15:28 +0000
@@ -1,5 +1,9 @@
 """
+<<<<<<< TREE
 Copyright (c) 2003-2010  Gustavo Niemeyer <[e-mail]>
+=======
+Copyright (c) 2003-2007  Gustavo Niemeyer <[e-mail]>
+>>>>>>> MERGE-SOURCE
 
 This module offers extensions to the standard python 2.3+
 datetime module.

=== added file 'dateutil/zoneinfo/zoneinfo-2008e.tar.gz'
Binary files dateutil/zoneinfo/zoneinfo-2008e.tar.gz	1970-01-01 00:00:00 +0000 and dateutil/zoneinfo/zoneinfo-2008e.tar.gz	2011-10-19 18:15:28 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-30 22:20:22 +0000
+++ debian/changelog	2011-10-19 18:15:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 python-dateutil (1.5-1) unstable; urgency=low
 
   [ Guido Günther ]
@@ -81,3 +82,80 @@
 
  -- Guido Guenther <[e-mail]>  Wed,  6 Sep 2006 10:33:06 +0200
 
+=======
+python-dateutil (1.4.1-4) unstable; urgency=low
+
+  [ Barry Warsaw ]
+  * [1cda493] Switch to dh_python2 (Closes: #633888) (LP: #788514)
+
+  [ Guido Günther ]
+  * [22c75cc] Bump standard version
+  * [7acb296] Depend on python-all since we don't ship arch any packages
+
+ -- Guido Günther <[e-mail]>  Sat, 16 Jul 2011 20:59:10 +0200
+
+python-dateutil (1.4.1-3ubuntu1) oneiric; urgency=low
+
+  * Switch to dh_python2.  (LP: #788514)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 14 Jul 2011 14:36:13 -0400
+
+python-dateutil (1.4.1-3) unstable; urgency=low
+
+  * [95a66ef] depend on tzdata and update description
+  * [93fe8b9] don't depend on pysupport internals (Closes: #516907) -
+    thanks to Josselin Mouette for pointing this out and providing a fix
+
+ -- Guido Günther <[e-mail]>  Tue, 24 Feb 2009 22:30:33 +0100
+
+python-dateutil (1.4.1-2) unstable; urgency=low
+
+  * [a5de481] don't ship timezone information (Closes: #416204)
+  * [4f4aa5d] add README.source
+  * [174ea3e] bump standards version
+
+ -- Guido Guenther <[e-mail]>  Tue, 30 Sep 2008 18:49:25 +0200
+
+python-dateutil (1.4.1-1) unstable; urgency=low
+
+  * [292923b] New Upstream version 1.4.1
+  * [abd914e] uscan: justs downloading is enough
+
+ -- Guido Guenther <[e-mail]>  Thu, 14 Aug 2008 08:44:02 +0200
+
+python-dateutil (1.4-1) unstable; urgency=low
+
+  * new upstream version
+  * add watch file from dehs.debian.org
+  * build-depend on python-setuptools 
+
+ -- Guido Guenther <[e-mail]>  Wed, 12 Mar 2008 10:59:20 +0100
+
+python-dateutil (1.3-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Guido Guenther <[e-mail]>  Mon, 10 Dec 2007 10:10:42 +0100
+
+python-dateutil (1.2-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Guido Guenther <[e-mail]>  Sun, 05 Aug 2007 14:35:21 +0200
+
+python-dateutil (1.1-1) unstable; urgency=low
+
+  * new upstream version
+  * add pyversions file
+  * depend on python-all-dev instead of python-dev so we can build for all
+    currently supported python versions
+
+ -- Guido Guenther <[e-mail]>  Tue, 12 Sep 2006 14:52:14 +0200
+
+python-dateutil (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #386256)
+
+ -- Guido Guenther <[e-mail]>  Wed,  6 Sep 2006 10:33:06 +0200
+
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/control'
--- debian/control	2011-08-30 22:20:22 +0000
+++ debian/control	2011-10-19 18:15:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Source: python-dateutil
 Section: python
 Priority: optional
@@ -28,3 +29,35 @@
   * computing of Easter Sunday dates for any given year, using Western, Orthodox
     or Julian algorithms
 
+=======
+Source: python-dateutil
+Section: python
+Priority: optional
+Maintainer: Guido Günther <[e-mail]>
+Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 5), quilt, python-all (>= 2.6.6-3~), python-setuptools
+Standards-Version: 3.9.2
+XS-Vcs-Git: git://git.debian.org/git/calendarserver/python-dateutil.git
+XS-Vcs-Browser: http://git.debian.org/?p=calendarserver/python-dateutil.git
+X-Python-Version: >= 2.3
+
+Package: python-dateutil
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, tzdata
+Description: powerful extensions to the standard datetime module
+ It features:
+ .
+  * computing of relative deltas (next month, next year, next monday, last week
+    of month, etc);
+  * computing of relative deltas between two given date and/or datetime objects
+  * computing of dates based on very flexible recurrence rules, using a superset
+    of the iCalendar specification. Parsing of RFC strings is supported as well.
+  * generic parsing of dates in almost any string format
+  * timezone (tzinfo) implementations for tzfile(5) format files
+    (/etc/localtime, /usr/share/zoneinfo, etc), TZ environment string (in all
+    known formats), iCalendar format files, given ranges (with help from
+    relative deltas), local machine timezone, fixed offset timezone, UTC
+    timezone
+  * computing of Easter Sunday dates for any given year, using Western, Orthodox
+    or Julian algorithms
+
+>>>>>>> MERGE-SOURCE

=== added file 'debian/patches/fix_locale.diff'
--- debian/patches/fix_locale.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_locale.diff	2011-10-19 18:15:28 +0000
@@ -0,0 +1,13 @@
+Index: python-dateutil/example.py
+===================================================================
+--- python-dateutil.orig/example.py	2006-09-06 13:21:44.000000000 +0200
++++ python-dateutil/example.py	2006-09-06 13:21:56.000000000 +0200
+@@ -5,7 +5,7 @@
+ from datetime import *
+ import commands
+ import os
+-now = parse(commands.getoutput("date"))
++now = parse(commands.getoutput("LC_ALL=C date"))
+ today = now.date()
+ year = rrule(YEARLY,bymonth=8,bymonthday=13,byweekday=FR)[0].year
+ rdelta = relativedelta(easter(year), today)

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-30 22:20:22 +0000
+++ debian/patches/series	2011-10-19 18:15:28 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 Use-C-locale-when-calling-date.patch
+=======
+fix_locale.diff
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/rules'
--- debian/rules	2011-08-30 22:20:22 +0000
+++ debian/rules	2011-10-19 18:15:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
@@ -12,3 +13,18 @@
 
 override_dh_auto_test:
 	python test.py
+=======
+#!/usr/bin/make -f
+  
+DEB_TAR_SRCDIR                  := python-dateutil
+DEB_AUTO_CLEANUP_RCS            := yes
+
+DEB_PYTHON_CLEAN_ARGS = --all
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+install/python-dateutil::
+	rm -f debian/python-dateutil/usr/lib/`pyversions -d`/site-packages/dateutil/zoneinfo/zoneinfo-*.tar.gz
+>>>>>>> MERGE-SOURCE

=== modified file 'python_dateutil.egg-info/PKG-INFO'
--- python_dateutil.egg-info/PKG-INFO	2011-08-30 22:20:22 +0000
+++ python_dateutil.egg-info/PKG-INFO	2011-10-19 18:15:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Metadata-Version: 1.0
 Name: python-dateutil
 Version: 1.5
@@ -10,3 +11,17 @@
         datetime module, available in Python 2.3+.
         
 Platform: UNKNOWN
+=======
+Metadata-Version: 1.0
+Name: python-dateutil
+Version: 1.4.1
+Summary: Extensions to the standard python 2.3+ datetime module
+Home-page: http://labix.org/python-dateutil
+Author: Gustavo Niemeyer
+Author-email: [e-mail]
+License: PSF License
+Description: The dateutil module provides powerful extensions to the standard
+        datetime module, available in Python 2.3+.
+        
+Platform: UNKNOWN
+>>>>>>> MERGE-SOURCE

=== modified file 'python_dateutil.egg-info/SOURCES.txt'
--- python_dateutil.egg-info/SOURCES.txt	2011-08-30 22:20:22 +0000
+++ python_dateutil.egg-info/SOURCES.txt	2011-10-19 18:15:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 LICENSE
 MANIFEST.in
 Makefile
@@ -23,4 +24,30 @@
 python_dateutil.egg-info/not-zip-safe
 python_dateutil.egg-info/top_level.txt
 sandbox/rrulewrapper.py
-sandbox/scheduler.py
\ No newline at end of file
+sandbox/scheduler.py=======
+LICENSE
+MANIFEST.in
+Makefile
+NEWS
+README
+example.py
+setup.cfg
+setup.py
+test.py
+updatezinfo.py
+dateutil/__init__.py
+dateutil/easter.py
+dateutil/parser.py
+dateutil/relativedelta.py
+dateutil/rrule.py
+dateutil/tz.py
+dateutil/tzwin.py
+dateutil/zoneinfo/__init__.py
+dateutil/zoneinfo/zoneinfo-2008e.tar.gz
+python_dateutil.egg-info/PKG-INFO
+python_dateutil.egg-info/SOURCES.txt
+python_dateutil.egg-info/dependency_links.txt
+python_dateutil.egg-info/not-zip-safe
+python_dateutil.egg-info/top_level.txt
+sandbox/rrulewrapper.py
+sandbox/scheduler.py>>>>>>> MERGE-SOURCE

=== modified file 'setup.py'
--- setup.py	2011-08-30 22:20:22 +0000
+++ setup.py	2011-10-19 18:15:28 +0000
@@ -10,11 +10,18 @@
 if isfile("MANIFEST"):
     os.unlink("MANIFEST")
 
+<<<<<<< TREE
 
 TOPDIR = os.path.dirname(__file__) or "."
 VERSION = re.search('__version__ = "([^"]+)"',
                     open(TOPDIR + "/dateutil/__init__.py").read()).group(1)
 
+=======
+
+VERSION = re.search('__version__ = "([^"]+)"',
+                    open("dateutil/__init__.py").read()).group(1)
+
+>>>>>>> MERGE-SOURCE
 
 setup(name="python-dateutil",
       version = VERSION,

=== modified file 'test.py'