[Python-modules-commits] r21805 - in packages/python-bitarray/trunk/debian (7 files)

Thu May 17 21:15:36 UTC 2012

Date: Thursday, May 17, 2012 @ 21:15:34
  Author: jandd
Revision: 21805

* New upstream version.
* remove debian/patches/0001_fix_typo_in_example.patch, not relevant
  anymore
* move from python-support to dh_python2
  - remove python-support from Build-Depends
  - bump minimum python version to 2.6.6-3~
  - remove debian/pycompat
  - add --with python2 to debian/rules
* bump Standards-Version to 3.9.3 (no changes)
* build README.html from README.rst using upstream's update_readme.py
* run test suite
* enable hardening build flags
  - import build flags in debian/rules
  - add dpkg-dev (>= 1.16.1~) to Build-Depends
* update debian/copyright format

Modified:
  packages/python-bitarray/trunk/debian/changelog
  packages/python-bitarray/trunk/debian/control
  packages/python-bitarray/trunk/debian/copyright
  packages/python-bitarray/trunk/debian/docs
  packages/python-bitarray/trunk/debian/rules
Deleted:
  packages/python-bitarray/trunk/debian/patches/
  packages/python-bitarray/trunk/debian/pycompat

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

--- packages/python-bitarray/trunk/debian/changelog	2012-05-17 20:02:41 UTC (rev 21804)
+++ packages/python-bitarray/trunk/debian/changelog	2012-05-17 21:15:34 UTC (rev 21805)
@@ -1,3 +1,23 @@
+python-bitarray (0.8.0-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * remove debian/patches/0001_fix_typo_in_example.patch, not relevant
+    anymore
+  * move from python-support to dh_python2
+    - remove python-support from Build-Depends
+    - bump minimum python version to 2.6.6-3~
+    - remove debian/pycompat
+    - add --with python2 to debian/rules
+  * bump Standards-Version to 3.9.3 (no changes)
+  * build README.html from README.rst using upstream's update_readme.py
+  * run test suite
+  * enable hardening build flags
+    - import build flags in debian/rules
+    - add dpkg-dev (>= 1.16.1~) to Build-Depends
+  * update debian/copyright format
+
+ -- Jan Dittberner <jandd at debian.org>  Thu, 17 May 2012 20:06:57 +0200
+
 python-bitarray (0.3.5-1) unstable; urgency=low
 
   * Initial release. (Closes: #593333)

Modified: packages/python-bitarray/trunk/debian/control
===================================================================
--- packages/python-bitarray/trunk/debian/control	2012-05-17 20:02:41 UTC (rev 21804)
+++ packages/python-bitarray/trunk/debian/control	2012-05-17 21:15:34 UTC (rev 21805)
@@ -3,10 +3,9 @@
 Priority: optional
 Maintainer: Jan Dittberner <jandd at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev, python (>=
- 2.5.4-1~), python-support (>= 0.6.4)
-Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev, python (>= 2.6.6-3~),
+ python-docutils, dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.3
 Homepage: http://pypi.python.org/pypi/bitarray
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-bitarray/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-bitarray/trunk

Modified: packages/python-bitarray/trunk/debian/copyright
===================================================================
--- packages/python-bitarray/trunk/debian/copyright	2012-05-17 20:02:41 UTC (rev 21804)
+++ packages/python-bitarray/trunk/debian/copyright	2012-05-17 21:15:34 UTC (rev 21805)
@@ -1,19 +1,19 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: python-bitarray
-Maintainer: Ilan Schnell <ilanschnell at gmail.com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: python-bitarray
+Upstream-Contact: Ilan Schnell <ilanschnell at gmail.com>
 Source: http://pypi.python.org/pypi/bitarray/
 
 Files: *
-Copyright: 2008-2009, Ilan Schnell ilanschnell at gmail.com
-License: PSF
+Copyright: 2008-2012, Ilan Schnell ilanschnell at gmail.com
+License: Python
  PYTHON SOFTWARE FOUNDATION LICENSE
  ----------------------------------
- 
+ .
  1. This LICENSE AGREEMENT is between the Python Software Foundation
  ("PSF"), and the Individual or Organization ("Licensee") accessing and
  otherwise using this software ("Python") in source or binary form and
  its associated documentation.
- 
+ .
  2. Subject to the terms and conditions of this License Agreement, PSF
  hereby grants Licensee a nonexclusive, royalty-free, world-wide
  license to reproduce, analyze, test, perform and/or display publicly,
@@ -23,40 +23,40 @@
  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Python Software Foundation; 
  All Rights Reserved" are retained in Python alone or in any derivative 
  version prepared by Licensee.
- 
+ .
  3. In the event Licensee prepares a derivative work that is based on
  or incorporates Python or any part thereof, and wants to make
  the derivative work available to others as provided herein, then
  Licensee hereby agrees to include in any such work a brief summary of
  the changes made to Python.
- 
+ .
  4. PSF is making Python available to Licensee on an "AS IS"
  basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
  IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
  DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
  FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
  INFRINGE ANY THIRD PARTY RIGHTS.
- 
+ .
  5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
  FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
  A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
  OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- 
+ .
  6. This License Agreement will automatically terminate upon a material
  breach of its terms and conditions.
- 
+ .
  7. Nothing in this License Agreement shall be deemed to create any
  relationship of agency, partnership, or joint venture between PSF and
  Licensee.  This License Agreement does not grant permission to use PSF
  trademarks or trade name in a trademark sense to endorse or promote
  products or services of Licensee, or any third party.
- 
+ .
  8. By copying, installing or otherwise using Python, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.
 
 Files: debian/*
-Copyright: 2010, Jan Dittberner jandd at debian.org
+Copyright: 2010-2012 Jan Dittberner jandd at debian.org
 License: GPL-3
  On Debian systems, the complete text of the GNU General Public License
  can be found in `/usr/share/common-licenses/GPL-3'.

Modified: packages/python-bitarray/trunk/debian/docs
===================================================================
--- packages/python-bitarray/trunk/debian/docs	2012-05-17 20:02:41 UTC (rev 21804)
+++ packages/python-bitarray/trunk/debian/docs	2012-05-17 21:15:34 UTC (rev 21805)
@@ -1 +1 @@
-AUTHORS README README.html TODO
+AUTHORS README.rst README.html TODO

Deleted: packages/python-bitarray/trunk/debian/pycompat
===================================================================
--- packages/python-bitarray/trunk/debian/pycompat	2012-05-17 20:02:41 UTC (rev 21804)
+++ packages/python-bitarray/trunk/debian/pycompat	2012-05-17 21:15:34 UTC (rev 21805)
@@ -1 +0,0 @@
-2

Modified: packages/python-bitarray/trunk/debian/rules
===================================================================
--- packages/python-bitarray/trunk/debian/rules	2012-05-17 20:02:41 UTC (rev 21804)
+++ packages/python-bitarray/trunk/debian/rules	2012-05-17 21:15:34 UTC (rev 21805)
@@ -1,7 +1,39 @@
 #!/usr/bin/make -f
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+include /usr/share/python/python.mk
+
+DOCTEMPDIR=$(CURDIR)/debian/buildhtml
+DEFAULTPYTHON=$(shell pyversions -d)
+PYVERS=$(shell pyversions -i)
+
+override_dh_auto_clean:
+	rm -rf $(DOCTEMPDIR) README.html
+	dh_auto_clean
+
+override_dh_installdocs:
+	mkdir $(DOCTEMPDIR); \
+	sed 's,rst2html\.py,rst2html,' <$(CURDIR)/update_readme.py >$(DOCTEMPDIR)/update_readme.py; \
+	cp $(CURDIR)/README.rst $(CURDIR)/CHANGE_LOG $(DOCTEMPDIR); \
+	cd $(DOCTEMPDIR); \
+	PYTHONPATH=$(CURDIR)/debian/python-bitarray$(call py_libdir, $(DEFAULTPYTHON)) $(DEFAULTPYTHON) update_readme.py; \
+	mv $(DOCTEMPDIR)/README.html $(CURDIR)
+	rm -rf $(DOCTEMPDIR)
+	dh_installdocs
+
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGE_LOG
 
+run-test%:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+		set -e -x; \
+		# move to debian dir to avoid import conflict
+		cd $(CURDIR)/debian; \
+		PYTHONPATH=$(CURDIR)/$(call py_builddir, $(shell echo $*)) $* -c 'import bitarray; bitarray.test()'
+endif
+
+override_dh_auto_test: $(PYVERS:%=run-test%)
+
 %:
-	dh $@
+	dh --with python2 $@ --buildsystem=python_distutils


