[Python-modules-commits] r23242 - in packages/simplejson/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Thursday, January 3, 2013 @ 21:03:00
  Author: piotr
Revision: 23242

* New upstream release
* Add python-simplejson-doc binary package
* Add python-simplejson-dbg binary package
* Add python3-simplejson{,-dbg} binary packages
  - build depend on python3-all-d{ev,bg}
* Rewrite debian/rules to use dh sequencer and pybuild build system

Modified:
  packages/simplejson/trunk/debian/changelog
  packages/simplejson/trunk/debian/compat
  packages/simplejson/trunk/debian/control
  packages/simplejson/trunk/debian/rules

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2013-01-03 20:42:53 UTC (rev 23241)
+++ packages/simplejson/trunk/debian/changelog	2013-01-03 21:03:00 UTC (rev 23242)
@@ -1,3 +1,14 @@
+simplejson (3.0.5-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Add python-simplejson-doc binary package
+  * Add python-simplejson-dbg binary package
+  * Add python3-simplejson{,-dbg} binary packages
+    - build depend on python3-all-d{ev,bg}
+  * Rewrite debian/rules to use dh sequencer and pybuild build system
+
+ -- Piotr Ożarowski <piotr at debian.org>  Thu, 03 Jan 2013 20:54:07 +0100
+
 simplejson (2.6.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/simplejson/trunk/debian/compat
===================================================================
--- packages/simplejson/trunk/debian/compat	2013-01-03 20:42:53 UTC (rev 23241)
+++ packages/simplejson/trunk/debian/compat	2013-01-03 21:03:00 UTC (rev 23242)
@@ -1 +1 @@
-7
+9

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2013-01-03 20:42:53 UTC (rev 23241)
+++ packages/simplejson/trunk/debian/control	2013-01-03 21:03:00 UTC (rev 23242)
@@ -4,10 +4,12 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Piotr Ożarowski <piotr at debian.org>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-11),
- python-sphinx (>= 1.0.7+dfsg-1~)
+Build-Depends: debhelper (>= 9), python-sphinx (>= 1.0.7+dfsg-1~),
+ python-all-dev, python-all-dbg,
+ python3-all-dev (>= 3.3.0-2), python3-all-dbg
 Homepage: http://undefined.org/python/#simplejson
 X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/simplejson/trunk/
 
@@ -31,3 +33,43 @@
  simplejson is the externally maintained development version of the json
  library included with Python 2.6 and Python 3.0, but maintains backwards
  compatibility with Python 2.5.
+
+Package: python-simplejson-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: python-simplejson (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Description: JSON encoder and decoder for python-dbg
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-simplejson
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: JSON encoder and decoder for Python 3
+ simplejson is the externally maintained development version of the
+ json library included with Python 2.6 and Python 3.0.
+ .
+ The encoder may be subclassed to provide serialization in any kind of
+ situation, without any special support by the objects to be serialized
+ (somewhat like pickle).
+ .
+ The decoder can handle incoming JSON strings of any specified encoding
+ (UTF-8 by default).
+
+Package: python3-simplejson-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: python3-simplejson (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
+Description: JSON encoder and decoder for python3-dbg
+ This package contains the extension built for the Python 3 debug interpreter.
+
+Package: python-simplejson-doc
+Section: doc
+Architecture: all
+Priority: extra
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Recommends: python-simplejson
+Conflicts: python-simplejson (<= 3)
+Description: documentation for the simplejson Python library
+ This package contains documentation for simplejson Python library.

Modified: packages/simplejson/trunk/debian/rules
===================================================================
--- packages/simplejson/trunk/debian/rules	2013-01-03 20:42:53 UTC (rev 23241)
+++ packages/simplejson/trunk/debian/rules	2013-01-03 21:03:00 UTC (rev 23242)
@@ -1,73 +1,15 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
 
-PACKAGE_NAME=python-simplejson
-MODULE_NAME=simplejson
+export PYBUILD_DESTDIR_python2=debian/python-simplejson/
+export PYBUILD_DESTDIR_python2-dbg=debian/python-simplejson-dbg/
+export PYBUILD_DESTDIR_python3=debian/python3-simplejson/
+export PYBUILD_DESTDIR_python3-dbg=debian/python3-simplejson-dbg/
 
-PYVERS=$(shell pyversions -vr)
-DPKG_EXPORT_BUILDFLAGS = 1
--include /usr/share/dpkg/buildflags.mk
+%:
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-clean:
+build-indep:
 	dh_testdir
-	dh_testroot
-	rm -rf dist build build-stamp build-ext-*
-	rm -rf $(MODULE_NAME).egg-info
-	find . -name '*\.py[co]' -delete
-	find . -name '\._*' -delete
-	dh_clean install-stamp install-ext-* build-docs simplejson/_speedups.so
-
-build: build-arch build-indep
-build-arch: $(PYVERS:%=build-ext-%)
-	touch $@
-build-ext-%:
-	dh_testdir
-	python$* setup.py build
-	touch $@
-
-build-indep: build-docs
-build-docs:
-	dh_testdir
 	dh_installdirs
 	sphinx-build -N -q -E -b html . \
-	 $(CURDIR)/debian/${PACKAGE_NAME}/usr/share/doc/${PACKAGE_NAME}/
-	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-arch $(PYVERS:%=install-ext-%)
-	touch $@
-install-ext-%:
-	python$* setup.py install \
-		--root $(CURDIR)/debian/$(PACKAGE_NAME)
-	touch $@
-
-binary-indep:
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_sphinxdoc
-	dh_python2
-	dh_strip
-	dh_compress -X.py -X.json -X.js
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -- -Z bzip2
-
-binary: binary-indep binary-arch
-
-.PHONY: clean binary-indep binary-arch binary
+	 $(CURDIR)/debian/python-simplejson-doc/usr/share/doc/python-simplejson-doc/