[Python-modules-commits] r18444 - in packages/simplejson/trunk/debian (changelog control rules)

[piotr at users.alioth.debian.org]

    Date: Monday, September 5, 2011 @ 19:41:49
  Author: piotr
Revision: 18444

* New upstream release
  - setuptools no longer used (yay!): python-setuptools removed from
    Build-Depends, setup.py install call updated in debian/rules
* Let dh_sphinxdoc handle documentation files, python-sphinx build
  dependency bumped to 1.0.7+dfsg-1

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

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2011-09-05 18:05:56 UTC (rev 18443)
+++ packages/simplejson/trunk/debian/changelog	2011-09-05 19:41:49 UTC (rev 18444)
@@ -1,3 +1,13 @@
+simplejson (2.2.0-1) unstable; urgency=low
+
+  * New upstream release
+    - setuptools no longer used (yay!): python-setuptools removed from
+      Build-Depends, setup.py install call updated in debian/rules
+  * Let dh_sphinxdoc handle documentation files, python-sphinx build
+    dependency bumped to 1.0.7+dfsg-1
+
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 05 Sep 2011 20:58:57 +0200
+
 simplejson (2.1.6-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2011-09-05 18:05:56 UTC (rev 18443)
+++ packages/simplejson/trunk/debian/control	2011-09-05 19:41:49 UTC (rev 18444)
@@ -5,7 +5,7 @@
 Uploaders: Piotr Ożarowski <piotr at debian.org>
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11),
- python-setuptools (>= 0.6b3), python-sphinx
+ python-sphinx (>= 1.0.7+dfsg-1~)
 Homepage: http://undefined.org/python/#simplejson
 X-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/

Modified: packages/simplejson/trunk/debian/rules
===================================================================
--- packages/simplejson/trunk/debian/rules	2011-09-05 18:05:56 UTC (rev 18443)
+++ packages/simplejson/trunk/debian/rules	2011-09-05 19:41:49 UTC (rev 18444)
@@ -6,13 +6,6 @@
 
 PYVERS=$(shell pyversions -vr)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS += -O0
-else
-  CFLAGS += -O2
-endif
-export CFLAGS
-
 clean:
 	dh_testdir
 	dh_testroot
@@ -22,19 +15,20 @@
 	find . -name '\._*' -delete
 	dh_clean install-stamp install-ext-* build-docs simplejson/_speedups.so
 
-build: build-stamp build-docs
-build-stamp: $(PYVERS:%=build-ext-%)
+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}/
-	rm -rf $(CURDIR)/debian/${PACKAGE_NAME}/usr/share/doc/${PACKAGE_NAME}/.doctrees
 	touch $@
 
 test: $(PYVERS:%=test-python%)
@@ -47,12 +41,11 @@
 endif
 
 install: install-stamp
-install-stamp: build-stamp $(PYVERS:%=install-ext-%)
+install-stamp: build-arch $(PYVERS:%=install-ext-%)
 	touch $@
 install-ext-%:
 	python$* setup.py install \
-		--root $(CURDIR)/debian/$(PACKAGE_NAME) \
-		--single-version-externally-managed
+		--root $(CURDIR)/debian/$(PACKAGE_NAME)
 	touch $@
 
 binary-indep:
@@ -62,8 +55,7 @@
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
-	dh_link /usr/share/javascript/jquery/jquery.js \
-		/usr/share/doc/python-simplejson/_static/jquery.js
+	dh_sphinxdoc
 	dh_python2
 	dh_strip
 	dh_compress -X.py -X.json -X.js