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

christoph at users.alioth.debian.org christoph at users.alioth.debian.org
Sat Sep 14 21:16:10 UTC 2013


    Date: Saturday, September 14, 2013 @ 21:15:56
  Author: christoph
Revision: 25866

Replace by 3.5 packaging

Mostly replacing 2.2 packaging by 3.5 packaging (lot's of things
changed upstream) and get things ready for NEW

Added:
  packages/python-icalendar/trunk/debian/doc-base
  packages/python-icalendar/trunk/debian/docs
Modified:
  packages/python-icalendar/trunk/debian/changelog
  packages/python-icalendar/trunk/debian/compat
  packages/python-icalendar/trunk/debian/control
  packages/python-icalendar/trunk/debian/copyright
  packages/python-icalendar/trunk/debian/rules
  packages/python-icalendar/trunk/debian/watch
Deleted:
  packages/python-icalendar/trunk/debian/patches/
  packages/python-icalendar/trunk/debian/python-icalendar.doc-base

Modified: packages/python-icalendar/trunk/debian/changelog
===================================================================
--- packages/python-icalendar/trunk/debian/changelog	2013-09-14 13:36:09 UTC (rev 25865)
+++ packages/python-icalendar/trunk/debian/changelog	2013-09-14 21:15:56 UTC (rev 25866)
@@ -1,11 +1,5 @@
-python-icalendar (2.2~dfsg1-2) UNRELEASED; urgency=low
+python-icalendar (3.5-1) unstable; urgency=low
 
-  * Use canonical URIs for Vcs-* fields.
+  * Initial release. (Closes: #691443)
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:46 +0200
-
-python-icalendar (2.2~dfsg1-1) unstable; urgency=low
-
-  * Initial release (Closes: #654920).
-
- -- Paul Tagliamonte <paultag at ubuntu.com>  Sat, 07 Jan 2012 17:27:41 -0500
+ -- Christoph Egger <christoph at debian.org>  Sat, 14 Sep 2013 22:17:08 +0200

Modified: packages/python-icalendar/trunk/debian/compat
===================================================================
--- packages/python-icalendar/trunk/debian/compat	2013-09-14 13:36:09 UTC (rev 25865)
+++ packages/python-icalendar/trunk/debian/compat	2013-09-14 21:15:56 UTC (rev 25866)
@@ -1 +1 @@
-7
+8

Modified: packages/python-icalendar/trunk/debian/control
===================================================================
--- packages/python-icalendar/trunk/debian/control	2013-09-14 13:36:09 UTC (rev 25865)
+++ packages/python-icalendar/trunk/debian/control	2013-09-14 21:15:56 UTC (rev 25866)
@@ -2,23 +2,29 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Paul Tagliamonte <paultag at ubuntu.com>,
- Alex Chiang <alex at chizang.net>,
- Elizabeth Krumbach <lyz at ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python-setuptools,
- python-sphinx (>= 1.0.7+dfsg) 
-Standards-Version: 3.9.2
-Homepage: https://github.com/collective/icalendar
+Uploaders: Christoph Egger <christoph at debian.org>
+Build-Depends: debhelper (>= 8~),
+ python-all,
+ python-setuptools,
+ python-sphinx,
+ python-tz,
+ python-dateutil
+Standards-Version: 3.9.4
+Homepage: http://icalendar.readthedocs.org/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-icalendar/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-icalendar/
-X-Python-Version: >= 2.5
 
 Package: python-icalendar
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends}
-Description: iCalendar parser/generator
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ ${sphinxdoc:Depends},
+ python-tz,
+ python-dateutil
+Provides: ${python:Provides}
+Description: parser/generator of iCalendar files for use with Python
  The icalendar package is a parser/generator of iCalendar files for use with
- Python. The aim of this fork was to bring this package up to date with latest
- icalendar RFC specification.
+ Python.
  .
  This package contains only Python bindings, no userland scripts.

Modified: packages/python-icalendar/trunk/debian/copyright
===================================================================
--- packages/python-icalendar/trunk/debian/copyright	2013-09-14 13:36:09 UTC (rev 25865)
+++ packages/python-icalendar/trunk/debian/copyright	2013-09-14 21:15:56 UTC (rev 25866)
@@ -1,52 +1,31 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
-Upstream-Name: icalendar
-Upstream-Contact: icalendar maintainers
-Source: https://github.com/collective/icalendar
-
 Files: *
-Copyright: 2010, icalendar maintainers
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+Copyright:
+  2012-2013, Plone Foundation
+License: BSD-2-clause
 
 Files: debian/*
-Copyright: 2011, Paul Tagliamonte <paultag at ubuntu.com>
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+Copyright:
+  2013 Christoph Egger
+License: BSD-2-clause
+
+License: BSD-2-clause
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+  
+   - Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+  
+   - 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.
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS 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 HOLDER OR 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.

Added: packages/python-icalendar/trunk/debian/doc-base
===================================================================
--- packages/python-icalendar/trunk/debian/doc-base	                        (rev 0)
+++ packages/python-icalendar/trunk/debian/doc-base	2013-09-14 21:15:56 UTC (rev 25866)
@@ -0,0 +1,9 @@
+Document: python-icalendar
+Title: Python iCalendar bindings
+Author: python-icalendar Authors
+Abstract: This manual describes the Python bindings to iCalendar.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-icalendar/html/index.html
+Files: /usr/share/doc/python-icalendar/html/*

Added: packages/python-icalendar/trunk/debian/docs
===================================================================
--- packages/python-icalendar/trunk/debian/docs	                        (rev 0)
+++ packages/python-icalendar/trunk/debian/docs	2013-09-14 21:15:56 UTC (rev 25866)
@@ -0,0 +1 @@
+docs/_build/html

Deleted: packages/python-icalendar/trunk/debian/python-icalendar.doc-base
===================================================================
--- packages/python-icalendar/trunk/debian/python-icalendar.doc-base	2013-09-14 13:36:09 UTC (rev 25865)
+++ packages/python-icalendar/trunk/debian/python-icalendar.doc-base	2013-09-14 21:15:56 UTC (rev 25866)
@@ -1,9 +0,0 @@
-Document: python-icalendar
-Title: Python iCalendar bindings
-Author: python-icalendar Authors
-Abstract: This manual describes the Python bindings to iCalendar.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-icalendar/html/index.html
-Files: /usr/share/doc/python-icalendar/html/*

Modified: packages/python-icalendar/trunk/debian/rules
===================================================================
--- packages/python-icalendar/trunk/debian/rules	2013-09-14 13:36:09 UTC (rev 25865)
+++ packages/python-icalendar/trunk/debian/rules	2013-09-14 21:15:56 UTC (rev 25866)
@@ -1,52 +1,23 @@
 #!/usr/bin/make -f
 
-PACKAGE_NAME=python-icalendar
-PACKAGE_DOCDIR=debian/$(PACKAGE_NAME)/usr/share/doc/$(PACKAGE_NAME)
-PACKAGE_LICENSE=/usr/share/common-licenses/GPL-2
-
-DFSG_NONFREE_FILES=./docs/rfc5545/ src/doctest.py
-
-DEB_UPSTREAM_VERSION_UNMANGLED=$(shell dpkg-parsechangelog | \
-	grep ^Version:\  | awk '{print $$2}' | sed 's/\~.*//g')
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | grep ^Version:\ | \
-	awk '{print $$2}' | sed 's/-.*//g' )
-
 %:
 	dh $@ --with python2
 
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) -C docs html
+
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rvf docs/_build src/*.egg-info
+	$(MAKE) -C docs clean
+	rm -fr src/icalendar.egg-info
 
 override_dh_auto_test:
-ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	set -e; for x in $(shell pyversions -r); do \
-		$$x ./setup.py test; \
-	done
-endif
+	python setup.py test
 
 override_dh_installdocs:
-	make -C docs html
-	mkdir -vp $(PACKAGE_DOCDIR)
-	cp -vr ./docs/_build/html $(PACKAGE_DOCDIR)
-	rm -v $(PACKAGE_DOCDIR)/html/_sources/license.txt
-	ln -s $(PACKAGE_LICENSE) $(PACKAGE_DOCDIR)/html/_sources/license.txt
 	dh_installdocs
 	dh_sphinxdoc
 
-override_dh_compress:
-	dh_compress -X.html
-
-get-orig-source:
-	uscan --noconf --force-download --rename --download-current-version \
-        --destdir=.
-	mkdir repack $(PACKAGE_NAME)-$(DEB_UPSTREAM_VERSION)
-	tar -xf $(DEB_UPSTREAM_VERSION_UNMANGLED) -C ./repack 
-	mv repack/*/* $(PACKAGE_NAME)-$(DEB_UPSTREAM_VERSION)
-	rm -fv $(DEB_UPSTREAM_VERSION_UNMANGLED)
-	cd $(PACKAGE_NAME)-$(DEB_UPSTREAM_VERSION); \
-		rm -rfv $(DFSG_NONFREE_FILES)
-	GZIP=--best tar -cz --owner root --group root --mode a+rX \
-		-f $(PACKAGE_NAME)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
-		$(PACKAGE_NAME)-$(DEB_UPSTREAM_VERSION)
-	rm -rf repack $(PACKAGE_NAME)-$(DEB_UPSTREAM_VERSION)
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.rst

Modified: packages/python-icalendar/trunk/debian/watch
===================================================================
--- packages/python-icalendar/trunk/debian/watch	2013-09-14 13:36:09 UTC (rev 25865)
+++ packages/python-icalendar/trunk/debian/watch	2013-09-14 21:15:56 UTC (rev 25866)
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\~dfsg\d*// \
-https://github.com/collective/icalendar/tags .*/tarball/(\d[\d\.]+)
+https://github.com/collective/icalendar/tags .*/(\d[\d\.]+)




More information about the Python-modules-commits mailing list