diff options
| author | Jelmer Vernooij <jelmer@debian.org> | 2016-04-09 13:22:32 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@debian.org> | 2016-04-09 13:26:40 +0000 |
| commit | f8588f337fc1f39d50b23b8d00360f806f692d33 (patch) | |
| tree | b1f6889d8b8f9a7bef432ac73329c2f8061aaf76 /debian | |
| parent | 7aa378e682d7641711125e93749202c3b4d7a3f3 (diff) | |
Convert package to source format 3.0 (quilt).
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/0003-Treat-untils-as-floating.patch | 10 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | debian/source/format | 1 |
5 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 4935c09..ab83858 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ python-vobject (0.9.2-1) UNRELEASED; urgency=medium * Drop patch 0004-Normalise-year-info-to-be-within-Python-s-year- bound.patch: alternative fix applied upstream. * Bump standards version to 3.9.7 (no changes). + * Convert package to source format 3.0 (quilt). -- Jelmer Vernooij <jelmer@debian.org> Sat, 09 Apr 2016 12:28:20 +0000 diff --git a/debian/control b/debian/control index 33ab209..c3f2529 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Calendarserver Maintainers <calendarserver-maintainers@lists.alioth.debian.org> Uploaders: Guido Günther <agx@sigxcpu.org>, Jelmer Vernooij <jelmer@debian.org> -Build-Depends: cdbs, debhelper (>= 5), python-dev, dh-python, python-dateutil, python-setuptools, quilt +Build-Depends: cdbs, debhelper (>= 5), python-dev, dh-python, python-dateutil, python-setuptools Standards-Version: 3.9.7 Vcs-Git: git://git.debian.org/git/calendarserver/python-vobject.git Vcs-Browser: http://git.debian.org/?p=calendarserver/python-vobject.git diff --git a/debian/patches/0003-Treat-untils-as-floating.patch b/debian/patches/0003-Treat-untils-as-floating.patch index 9f110d0..623ec8c 100644 --- a/debian/patches/0003-Treat-untils-as-floating.patch +++ b/debian/patches/0003-Treat-untils-as-floating.patch @@ -7,12 +7,12 @@ Subject: Treat untils as floating 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/vobject/icalendar.py b/vobject/icalendar.py -index 4a1da7c..b960deb 100644 +index c49dbbb..120b252 100644 --- a/vobject/icalendar.py +++ b/vobject/icalendar.py -@@ -427,6 +427,18 @@ class RecurringComponent(Component): - if dtstart.tzinfo is not None: - until = until.astimezone(dtstart.tzinfo) +@@ -451,6 +451,18 @@ class RecurringComponent(Component): + if dtstart.tzinfo is None: + until = until.replace(tzinfo=None) + # RFC2445 actually states that UNTIL must be a UTC value. Whilst the + # changes above work OK, one problem case is if DTSTART is floating but @@ -27,5 +27,5 @@ index 4a1da7c..b960deb 100644 + until = until.replace(tzinfo=None) + rule._until = until - + # add the rrule or exrule to the rruleset diff --git a/debian/rules b/debian/rules index 3eecd66..3f484f8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ # Add here any variable or target overrides you need 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 DEB_PYTHON_CLEAN_ARGS = --all DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) |