diff options
| -rw-r--r-- | debian/.gitignore | 6 | ||||
| -rw-r--r-- | debian/README.source | 57 | ||||
| -rw-r--r-- | debian/changelog | 177 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 19 | ||||
| -rw-r--r-- | debian/copyright | 68 | ||||
| -rw-r--r-- | debian/docs | 2 | ||||
| -rw-r--r-- | debian/patches/0001-don-t-install-ics_diff.patch | 25 | ||||
| -rw-r--r-- | debian/patches/0003-Treat-untils-as-floating.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/pycompat | 1 | ||||
| -rw-r--r-- | debian/pyversions | 1 | ||||
| -rwxr-xr-x | debian/rules | 14 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 5 |
15 files changed, 410 insertions, 0 deletions
diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..7213906 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,6 @@ +files +python-module-stampdir/ +*.debhelper +*.substvars +python-vobject/ +stamp-patched diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..8646078 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new <patch> + +where <patch> is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add <file> + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P <patch> /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). <patch> as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete <patch> + +You may need to run quilt pop -a to unapply patches first before running +this command. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..cf5b49e --- /dev/null +++ b/debian/changelog @@ -0,0 +1,177 @@ +python-vobject (0.9.2-1) unstable; urgency=low + + * debian/control: Update upstream homepage. + * debian/watch: Update upstream download URL. + * Add myself to uploaders. + * New upstream release. + * 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. + * 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 + +python-vobject (0.8.1c-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build using dh-python. Closes: #786151. + + -- Matthias Klose <doko@debian.org> Sat, 22 Aug 2015 08:38:11 +0200 + +python-vobject (0.8.1c-4) unstable; urgency=low + + * [80b984b] Restore original upstream behaviour on unrecognized parameters + (Closes: #569273) + * [ae6eba8] Normalise year info to be within Python's year bounds. Thanks + to Dave Holland for the patch (Closes: #574133) + + -- Guido Günther <agx@sigxcpu.org> Wed, 01 Jun 2011 20:05:05 +0200 + +python-vobject (0.8.1c-3) unstable; urgency=low + + [ Rahul Amaram ] + * [57d7cbd] Add patches from Apple Calendarserver 2.3 acked by Jeffrey + Harris + + -- Guido Günther <agx@sigxcpu.org> Mon, 04 Jan 2010 20:32:01 +0100 + +python-vobject (0.8.1c-2) unstable; urgency=low + + * Upload to unstable (Closes: #554563) + * [0365f3c] Bump standards version + * [fda4195] Add README.source + + -- Guido Günther <agx@sigxcpu.org> Tue, 08 Dec 2009 20:38:38 +0100 + +python-vobject (0.8.1c-1) experimental; urgency=low + + * [d403e62] Imported Upstream version 0.8.1c + * [e66c3d7] rebase ics_diff patch + * [20fc2d0] conflict with calendarserver << 2.0 since older version + rely on vobject bugs that are now fixed + (http://trac.calendarserver.org/ticket/287) (Closes: #491915) + * [f03e51c] change maintainer to calendarserver team and bump + standards version + * [c5d850d] honor nocheck in DEB_BUILD_OPTIONS + * [17e1a18] debian/watch: allow letter in the version match + + -- Guido Günther <agx@sigxcpu.org> Fri, 17 Apr 2009 23:13:41 +0200 + +python-vobject (0.7.1-1) experimental; urgency=low + + * [43d3667] New Upstream version + * [ecc0342] drop support for python 2.4 - the code uses python 2.5 + constructs + * [0b81a6b] update remove_ics.diff patch + + -- Guido Guenther <agx@sigxcpu.org> Fri, 08 Aug 2008 14:46:19 +0200 + +python-vobject (0.6.6-1) experimental; urgency=low + + * Upload to experimental since it breaks calendarserver: + http://trac.calendarserver.org/ticket/287 + * [bd308fb] new upstream version 0.6.6 + * [59a6bae] refresh remove_ics_diff.patch + * [2a0a9d9] bump standards version to 3.8.0 + * [096502c] debian/control: add Homepage: + + -- Guido Guenther <agx@sigxcpu.org> Fri, 20 Jun 2008 09:37:02 +0200 + +python-vobject (0.6.0-1) unstable; urgency=low + + * New Upstream Version + * fix Python spelling + * fix PYTHONPATH for doctests + * lower setuptools version number since 0.6c8 isn't in Debian yet and + 0.6c7 is fine + + -- Guido Guenther <agx@sigxcpu.org> Fri, 22 Feb 2008 09:43:55 +0100 + +python-vobject (0.5.0-1) unstable; urgency=low + + * New upstream version + + -- Guido Guenther <agx@sigxcpu.org> Wed, 16 Jan 2008 11:45:55 +0100 + +python-vobject (0.4.9-1) unstable; urgency=low + + * New Upstream Version (Closes: #458188) + * update upstream URL + * add watch file + * add VCS-* fields + * bump standards version + + -- Guido Guenther <agx@sigxcpu.org> Wed, 02 Jan 2008 10:59:16 +0100 + +python-vobject (0.4.8-1) unstable; urgency=low + + * New Upstream Version (Closes: #421894) + * remove_ics_diff.patch: don't install /usr/bin/ics_diff + + -- Guido Guenther <agx@sigxcpu.org> Mon, 18 Jun 2007 18:30:30 +0200 + +python-vobject (0.4.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove quilt support as there is no patches dir (Closes: #393885). + + -- Luk Claes <luk@debian.org> Thu, 26 Oct 2006 20:29:44 +0200 + +python-vobject (0.4.4-1) unstable; urgency=low + + * New Upstream Version + * includes all of our patches so we can drop debian/patches/*.patch + * good candidate for etch + + -- Guido Guenther <agx@sigxcpu.org> Wed, 11 Oct 2006 09:05:51 +0200 + +python-vobject (0.4.3-2) unstable; urgency=low + + * depend on python-setuptools (Closes: #391881). + + -- Guido Guenther <agx@sigxcpu.org> Mon, 9 Oct 2006 13:26:12 +0200 + +python-vobject (0.4.3-1) unstable; urgency=low + + * New Upstream (non SVN!) Version + * cdbs cleanups + + -- Guido Guenther <agx@sigxcpu.org> Sat, 7 Oct 2006 00:50:15 +0200 + +python-vobject (0.0.svn155-2) unstable; urgency=low + + * build depend on python-dateutil so the testuite can run properly. + (Closes: #389385) + + -- Guido Guenther <agx@sigxcpu.org> Mon, 25 Sep 2006 15:49:10 +0200 + +python-vobject (0.0.svn155-1) unstable; urgency=low + + * new upstream svn version + * update icalendar.patch and base.patch from revision 188 of: + http://trac.macosforge.org/projects/calendarserver/browser/CalendarServer/trunk/patches/vObject/base.patch + http://trac.macosforge.org/projects/calendarserver/browser/CalendarServer/trunk/patches/vObject/icalendar.patch + * call test during build + * add versione (>= 1.1) dependency for python-dateutil + + -- Guido Guenther <agx@sigxcpu.org> Sat, 23 Sep 2006 23:57:41 +0200 + +python-vobject (0.0.svn147-2) unstable; urgency=low + + * set pyversions + * rm debian/dirs + + -- Guido Guenther <agx@sigxcpu.org> Thu, 7 Sep 2006 16:23:55 +0200 + +python-vobject (0.0.svn147-1) unstable; urgency=low + + * Initial release (Closes: #386254) + * import icalendar.patch and base.patch: + http://trac.macosforge.org/projects/calendarserver/browser/CalendarServer/trunk/patches/vObject/base.patch + http://trac.macosforge.org/projects/calendarserver/browser/CalendarServer/trunk/patches/vObject/icalendar.patch + + -- Guido Guenther <agx@sigxcpu.org> Wed, 6 Sep 2006 11:04:33 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c3f2529 --- /dev/null +++ b/debian/control @@ -0,0 +1,19 @@ +Source: python-vobject +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 +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 +Homepage: https://eventable.github.io/vobject/ + +Package: python-vobject +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-dateutil (>= 1.1) +Conflicts: calendarserver (<< 2.0) +Description: parse iCalendar and VCards in Python + Parses iCalendar and vCard files into Python data structures, decoding the + relevant encodings. Also serializes vobject data structures to valid iCalendar + or vCard unicode strings. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5096462 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,68 @@ +This package was debianized by Guido Guenther <agx@sigxcpu.org> on +Wed, 6 Sep 2006 11:04:33 +0200. + +It was downloaded from http://vobject.skyhouseconsulting.com/ + +Upstream Author: Jeffrey Harris <jeffrey@osafoundation.org> + +Copyright (c) 2004-2006 Jeffrey Harris. All rights reserved. + +License: + +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2004-2006 Jeffrey Harris. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + * + * Portions of this software are based upon public domain software + * originally written at the National Center for Supercomputing Applications, + * University of Illinois, Urbana-Champaign. + */ + diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..c116515 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +ACKNOWLEDGEMENTS.txt +README.md diff --git a/debian/patches/0001-don-t-install-ics_diff.patch b/debian/patches/0001-don-t-install-ics_diff.patch new file mode 100644 index 0000000..d80f3fa --- /dev/null +++ b/debian/patches/0001-don-t-install-ics_diff.patch @@ -0,0 +1,25 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> +Date: Fri, 17 Apr 2009 22:46:06 +0200 +Subject: don't install ics_diff + +--- + setup.py | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9c21ad8..d84fa75 100755 +--- a/setup.py ++++ b/setup.py +@@ -41,12 +41,6 @@ setup(name = "vobject", + url = "http://eventable.github.io/vobject/",
+ download_url = 'https://github.com/eventable/vobject/tarball/0.9.1',
+ bugtrack_url = "https://github.com/eventable/vobject/issues",
+- entry_points = {
+- 'console_scripts': [
+- 'ics_diff = vobject.ics_diff:main',
+- 'change_tz = vobject.change_tz:main'
+- ]
+- },
+ include_package_data = True,
+ install_requires = ['python-dateutil >= 2.4.0'],
+ platforms = ["any"],
diff --git a/debian/patches/0003-Treat-untils-as-floating.patch b/debian/patches/0003-Treat-untils-as-floating.patch new file mode 100644 index 0000000..623ec8c --- /dev/null +++ b/debian/patches/0003-Treat-untils-as-floating.patch @@ -0,0 +1,31 @@ +From: Morgen Sagen <sagen@apple.com> +Date: Mon, 4 Jan 2010 20:27:01 +0100 +Subject: Treat untils as floating + +--- + vobject/icalendar.py | 14 +++++++++++++- + 1 files changed, 13 insertions(+), 1 deletions(-) + +diff --git a/vobject/icalendar.py b/vobject/icalendar.py +index c49dbbb..120b252 100644 +--- a/vobject/icalendar.py ++++ b/vobject/icalendar.py +@@ -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 ++ # UNTIL is properly specified as UTC (or with a TZID). In that case dateutil ++ # will fail datetime comparisons. There is no easy solution to this as ++ # there is no obvious timezone (at this point) to do proper floating time ++ # offset compisons. The best we can do is treat the UNTIL value as floating. ++ # This could mean incorrect determination of the last instance. The better ++ # solution here is to encourage clients to use COUNT rather than UNTIL ++ # when DTSTART is floating. ++ if dtstart.tzinfo is None: ++ until = until.replace(tzinfo=None) ++ + rule._until = until + + # add the rrule or exrule to the rruleset diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3cfdb10 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-don-t-install-ics_diff.patch +0003-Treat-untils-as-floating.patch diff --git a/debian/pycompat b/debian/pycompat new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/debian/pycompat @@ -0,0 +1 @@ +2 diff --git a/debian/pyversions b/debian/pyversions new file mode 100644 index 0000000..b3dc41e --- /dev/null +++ b/debian/pyversions @@ -0,0 +1 @@ +2.5- diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3f484f8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +# 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 + +DEB_PYTHON_CLEAN_ARGS = --all +DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed + +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +build/python-vobject:: + python tests.py +endif + 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) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..af24468 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +# Compulsory line, this is a version 3 file +version=3 + +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/vobject-$1\.tar\.gz/ \ + https://github.com/eventable/vobject/tags .*/v?(\d\S*)\.tar\.gz |