[Python-modules-commits] r14937 - in packages/simplejson/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Saturday, November 20, 2010 @ 19:45:56
  Author: piotr
Revision: 14937

* New upstream release
* Switch from dh_pysupport to dh_python2
* Source package format changed to 3.0 (quilt)
* Add test target in debian/rules to test all supported Python versions
  (not enabled by default as `setup.py test` ignores previously built
   extensions)
* Standards-version bumped to 3.9.1 (no changes needed)

Modified:
  packages/simplejson/trunk/debian/changelog
  packages/simplejson/trunk/debian/control
  packages/simplejson/trunk/debian/rules
  packages/simplejson/trunk/debian/source/format
Deleted:
  packages/simplejson/trunk/debian/README.source
  packages/simplejson/trunk/debian/pycompat

Deleted: packages/simplejson/trunk/debian/README.source
===================================================================
--- packages/simplejson/trunk/debian/README.source	2010-11-20 18:43:08 UTC (rev 14936)
+++ packages/simplejson/trunk/debian/README.source	2010-11-20 19:45:56 UTC (rev 14937)
@@ -1,2 +0,0 @@
-This package uses the patch management system quilt as documented in
-/usr/share/doc/quilt/README.source.

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2010-11-20 18:43:08 UTC (rev 14936)
+++ packages/simplejson/trunk/debian/changelog	2010-11-20 19:45:56 UTC (rev 14937)
@@ -1,3 +1,15 @@
+simplejson (2.1.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Switch from dh_pysupport to dh_python2
+  * Source package format changed to 3.0 (quilt)
+  * Add test target in debian/rules to test all supported Python versions
+    (not enabled by default as `setup.py test` ignores previously built
+     extensions)
+  * Standards-version bumped to 3.9.1 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 20 Nov 2010 20:05:53 +0100
+
 simplejson (2.1.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2010-11-20 18:43:08 UTC (rev 14936)
+++ packages/simplejson/trunk/debian/control	2010-11-20 19:45:56 UTC (rev 14937)
@@ -3,18 +3,18 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Piotr Ożarowski <piotr at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11),
- python-setuptools (>= 0.6b3), python-support (>= 0.6.4), python-sphinx
+ python-setuptools (>= 0.6b3), python-sphinx
 Homepage: http://undefined.org/python/#simplejson
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/simplejson/trunk/
 
 Package: python-simplejson
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-XB-Python-Version: ${python:Versions}
+Breaks: ${python:Breaks}
 Recommends: libjs-jquery
 Provides: ${python:Provides}
 Description: simple, fast, extensible JSON encoder/decoder for Python

Deleted: packages/simplejson/trunk/debian/pycompat
===================================================================
--- packages/simplejson/trunk/debian/pycompat	2010-11-20 18:43:08 UTC (rev 14936)
+++ packages/simplejson/trunk/debian/pycompat	2010-11-20 19:45:56 UTC (rev 14937)
@@ -1 +0,0 @@
-2

Modified: packages/simplejson/trunk/debian/rules
===================================================================
--- packages/simplejson/trunk/debian/rules	2010-11-20 18:43:08 UTC (rev 14936)
+++ packages/simplejson/trunk/debian/rules	2010-11-20 19:45:56 UTC (rev 14937)
@@ -20,7 +20,7 @@
 	rm -rf $(MODULE_NAME).egg-info
 	find . -name '*\.py[co]' -delete
 	find . -name '\._*' -delete
-	dh_clean install-stamp install-ext-* build-docs
+	dh_clean install-stamp install-ext-* build-docs simplejson/_speedups.so
 
 build: build-stamp build-docs
 build-stamp: $(PYVERS:%=build-ext-%)
@@ -37,6 +37,15 @@
 	rm -rf $(CURDIR)/debian/${PACKAGE_NAME}/usr/share/doc/${PACKAGE_NAME}/.doctrees
 	touch $@
 
+test: $(PYVERS:%=test-python%)
+# Note that tests are not invoked by default at build time
+# for now as setup.py ignores previously built extension and builds it again as
+# simplejson/_speedups.so
+test-python%: build-ext-%
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	python$* setup.py test --quiet
+endif
+
 install: install-stamp
 install-stamp: build-stamp $(PYVERS:%=install-ext-%)
 	touch $@
@@ -55,7 +64,7 @@
 	dh_installdocs
 	dh_link /usr/share/javascript/jquery/jquery.js \
 		/usr/share/doc/python-simplejson/_static/jquery.js
-	dh_pysupport
+	dh_python2
 	dh_strip
 	dh_compress -X.py -X.json -X.js
 	dh_fixperms

Modified: packages/simplejson/trunk/debian/source/format
===================================================================
--- packages/simplejson/trunk/debian/source/format	2010-11-20 18:43:08 UTC (rev 14936)
+++ packages/simplejson/trunk/debian/source/format	2010-11-20 19:45:56 UTC (rev 14937)
@@ -1 +1 @@
-1.0
+3.0 (quilt)