[Python-modules-commits] r11629 - in packages/simplejson/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Monday, February 8, 2010 @ 20:35:35
  Author: piotr
Revision: 11629

* Drop python2.4-simplejson from Replaces/Conflicts
* Install index.rst in /usr/share/doc/python-simplejson/
* Rebuild documentation (python-sphinx added to build dependencies)
* Standards-version bumped to 3.8.4 (no changes needed)

Modified:
  packages/simplejson/trunk/debian/changelog
  packages/simplejson/trunk/debian/control
  packages/simplejson/trunk/debian/copyright
  packages/simplejson/trunk/debian/docs
  packages/simplejson/trunk/debian/rules

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2010-02-08 16:27:11 UTC (rev 11628)
+++ packages/simplejson/trunk/debian/changelog	2010-02-08 20:35:35 UTC (rev 11629)
@@ -1,3 +1,12 @@
+simplejson (2.0.9-2) unstable; urgency=low
+
+  * Drop python2.4-simplejson from Replaces/Conflicts
+  * Install index.rst in /usr/share/doc/python-simplejson/
+  * Rebuild documentation (python-sphinx added to build dependencies)
+  * Standards-version bumped to 3.8.4 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 08 Feb 2010 20:59:44 +0100
+
 simplejson (2.0.9-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2010-02-08 16:27:11 UTC (rev 11628)
+++ packages/simplejson/trunk/debian/control	2010-02-08 20:35:35 UTC (rev 11629)
@@ -3,8 +3,9 @@
 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.0
-Build-Depends: debhelper (>= 5.0.38), quilt (>= 0.40), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6b3), python-support (>= 0.6.4)
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5.0.38), quilt (>= 0.40), python-all-dev (>= 2.3.5-11),
+ python-setuptools (>= 0.6b3), python-support (>= 0.6.4), python-sphinx
 Homepage: http://undefined.org/python/#simplejson
 XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/
@@ -12,13 +13,11 @@
 
 Package: python-simplejson
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Recommends: libjs-jquery
 Provides: ${python:Provides}
-Replaces: python2.4-simplejson
-Conflicts: python2.4-simplejson
-Description: Simple, fast, extensible JSON encoder/decoder for Python
+Description: simple, fast, extensible JSON encoder/decoder for Python
  simplejson is a simple, fast, complete, correct and extensible JSON
  <http://json.org> encoder and decoder. It is pure Python code with no
  dependencies.

Modified: packages/simplejson/trunk/debian/copyright
===================================================================
--- packages/simplejson/trunk/debian/copyright	2010-02-08 16:27:11 UTC (rev 11628)
+++ packages/simplejson/trunk/debian/copyright	2010-02-08 20:35:35 UTC (rev 11629)
@@ -34,5 +34,5 @@
 
 
 The Debian packaging is © 2006 Tommi Virtanen <tv at debian.org> and 
-© 2007-2009 Piotr Ożarowski <piotr at debian.org> - it is licensed under the MIT
+© 2007-2010 Piotr Ożarowski <piotr at debian.org> - it is licensed under the MIT
 license as well

Modified: packages/simplejson/trunk/debian/docs
===================================================================
--- packages/simplejson/trunk/debian/docs	2010-02-08 16:27:11 UTC (rev 11628)
+++ packages/simplejson/trunk/debian/docs	2010-02-08 20:35:35 UTC (rev 11629)
@@ -1 +1 @@
-docs
+index.rst

Modified: packages/simplejson/trunk/debian/rules
===================================================================
--- packages/simplejson/trunk/debian/rules	2010-02-08 16:27:11 UTC (rev 11628)
+++ packages/simplejson/trunk/debian/rules	2010-02-08 20:35:35 UTC (rev 11629)
@@ -21,15 +21,22 @@
 	rm -rf dist build build-stamp build-ext-*
 	rm -rf $(MODULE_NAME).egg-info
 	find . -name '*\.py[co]' -delete
-	dh_clean install-stamp install-ext-*
+	dh_clean install-stamp install-ext-* build-docs
 
-build: patch build-stamp
+build: patch build-stamp build-docs
 build-stamp: $(PYVERS:%=build-ext-%)
 	touch $@
 build-ext-%:
 	dh_testdir
 	python$* setup.py build
 	touch $@
+build-docs:
+	dh_testdir
+	dh_installdirs
+	sphinx-build -N -q -E -b html . \
+	 $(CURDIR)/debian/${PACKAGE_NAME}/usr/share/doc/${PACKAGE_NAME}/
+	rm -rf $(CURDIR)/debian/${PACKAGE_NAME}/usr/share/doc/${PACKAGE_NAME}/.doctrees
+	touch $@
 
 install: install-stamp
 install-stamp: build-stamp $(PYVERS:%=install-ext-%)
@@ -48,7 +55,7 @@
 	dh_installchangelogs
 	dh_installdocs
 	dh_link /usr/share/javascript/jquery/jquery.js \
-		/usr/share/doc/python-simplejson/docs/_static/jquery.js
+		/usr/share/doc/python-simplejson/_static/jquery.js
 	dh_pysupport
 	dh_strip
 	dh_compress -X.py -X.json -X.js