[Python-modules-commits] r27253 - in packages/python-icalendar/trunk/debian (5 files)

Fri Jan 17 06:40:40 UTC 2014

Date: Friday, January 17, 2014 @ 06:40:39
  Author: vcheng
Revision: 27253

python-icalendar: Fix RC bugs FTBFS (#733829) and missing license entry (#733001)

Added:
  packages/python-icalendar/trunk/debian/patches/
  packages/python-icalendar/trunk/debian/patches/series
  packages/python-icalendar/trunk/debian/patches/use_io_open.patch
Modified:
  packages/python-icalendar/trunk/debian/changelog
  packages/python-icalendar/trunk/debian/copyright

Modified: packages/python-icalendar/trunk/debian/changelog
===================================================================

--- packages/python-icalendar/trunk/debian/changelog	2014-01-16 21:22:02 UTC (rev 27252)
+++ packages/python-icalendar/trunk/debian/changelog	2014-01-17 06:40:39 UTC (rev 27253)
@@ -1,3 +1,14 @@
+python-icalendar (3.5-3) unstable; urgency=high
+
+  * Team upload.
+  * Urgency=high to fix 2 RC bugs.
+  * Add debian/patches/use_io_open.patch (from Ubuntu):
+    - setup.py: Use io.open() to open CHANGES.rst with an UTF-8 encoding
+      (fixes FTBFS with Python 2). (Closes: #733829)
+  * Mention ZPL 2.1 in debian/copyright. (Closes: #733001)
+
+ -- Vincent Cheng <vcheng at debian.org>  Thu, 16 Jan 2014 22:33:20 -0800
+
 python-icalendar (3.5-2) unstable; urgency=medium
 
   * Add python3 package

Modified: packages/python-icalendar/trunk/debian/copyright
===================================================================
--- packages/python-icalendar/trunk/debian/copyright	2014-01-16 21:22:02 UTC (rev 27252)
+++ packages/python-icalendar/trunk/debian/copyright	2014-01-17 06:40:39 UTC (rev 27253)
@@ -3,6 +3,11 @@
   2012-2013, Plone Foundation
 License: BSD-2-clause
 
+Files: bootstrap.py
+Copyright:
+  2006 Zope Corporation and Contributors
+License: Zope-2.1
+
 Files: debian/*
 Copyright:
   2013 Christoph Egger
@@ -29,3 +34,25 @@
   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.
+
+License: Zope-2.1
+Zope Public License (ZPL) Version 2.1
+A copyright notice accompanies this license document that identifies the copyright holders.
+
+This license has been certified as open source. It has also been designated as GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright notice, this list of conditions, and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote products derived from this software without prior written permission from the copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not give you the right to use Servicemarks (sm) or Trademarks (tm) of the copyright holders. Use of them is covered by separate agreement with the copyright holders.
+
+5. If any files are modified, you must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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 COPYRIGHT HOLDERS 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.

Added: packages/python-icalendar/trunk/debian/patches/series
===================================================================
--- packages/python-icalendar/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-icalendar/trunk/debian/patches/series	2014-01-17 06:40:39 UTC (rev 27253)
@@ -0,0 +1 @@
+use_io_open.patch

Added: packages/python-icalendar/trunk/debian/patches/use_io_open.patch
===================================================================
--- packages/python-icalendar/trunk/debian/patches/use_io_open.patch	                        (rev 0)
+++ packages/python-icalendar/trunk/debian/patches/use_io_open.patch	2014-01-17 06:40:39 UTC (rev 27253)
@@ -0,0 +1,19 @@
+Index: python-icalendar-3.5/setup.py
+===================================================================
+--- python-icalendar-3.5.orig/setup.py	2013-07-03 14:26:31.000000000 +0200
++++ python-icalendar-3.5/setup.py	2013-12-30 17:53:58.000000000 +0100
+@@ -1,10 +1,11 @@
+ import setuptools
++from io import open
+ 
+ version = '3.5'
+ shortdesc = 'iCalendar parser/generator'
+-longdesc = open('README.rst').read()
+-longdesc += open('CHANGES.rst').read()
+-longdesc += open('LICENSE.rst').read()
++longdesc = open('README.rst', encoding='utf-8').read()
++longdesc += open('CHANGES.rst', encoding='utf-8').read()
++longdesc += open('LICENSE.rst', encoding='utf-8').read()
+ tests_require = ['unittest2']
+ 
+ setuptools.setup(


