summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/0004-Normalise-year-info-to-be-within-Python-s-year-bound.patch26
-rw-r--r--debian/patches/series1
3 files changed, 2 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog
index 12345fd..85cfac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ python-vobject (0.9.2-1) UNRELEASED; urgency=medium
* Refresh patch 0001-don-t-install-ics_diff.patch.
* Drop patch 0002-Deepcopy-params.patch: applied upstream.
* Refresh patch 0003-Treat-untils-as-floating.patch.
+ * Drop patch 0004-Normalise-year-info-to-be-within-Python-s-year-
+ bound.patch: alternative fix applied upstream.
-- Jelmer Vernooij <jelmer@debian.org> Sat, 09 Apr 2016 12:28:20 +0000
diff --git a/debian/patches/0004-Normalise-year-info-to-be-within-Python-s-year-bound.patch b/debian/patches/0004-Normalise-year-info-to-be-within-Python-s-year-bound.patch
deleted file mode 100644
index 4cfccac..0000000
--- a/debian/patches/0004-Normalise-year-info-to-be-within-Python-s-year-bound.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Dave Holland <dave@debian.org>
-Date: Wed, 1 Jun 2011 19:58:27 +0200
-Subject: Normalise year info to be within Python's year bounds.
-
-Closes: #574133
----
- vobject/icalendar.py | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/vobject/icalendar.py b/vobject/icalendar.py
-index b960deb..79ea7af 100644
---- a/vobject/icalendar.py
-+++ b/vobject/icalendar.py
-@@ -1617,6 +1617,11 @@ def stringToDateTime(s, tzinfo=None):
- tzinfo = utc
- except:
- raise ParseError("'%s' is not a valid DATE-TIME" % s)
-+ if year < datetime.MINYEAR:
-+ year = datetime.MINYEAR
-+ if year > datetime.MAXYEAR:
-+ year = datetime.MAXYEAR
-+
- return datetime.datetime(year, month, day, hour, minute, second, 0, tzinfo)
-
-
---
diff --git a/debian/patches/series b/debian/patches/series
index c5209a5..3cfdb10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
0001-don-t-install-ics_diff.patch
0003-Treat-untils-as-floating.patch
-0004-Normalise-year-info-to-be-within-Python-s-year-bound.patch