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

[piotr at users.alioth.debian.org]

    Date: Thursday, September 22, 2011 @ 18:58:50
  Author: piotr
Revision: 18671

* Remove .pth file (introduced in last upload by accident)
* Add build-indep and build-arch targets in debian/rules
* Let dh_sphinxdoc handle documentation files, python-sphinx build
  dependency bumped to 1.0.7+dfsg-1

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

Modified: packages/paste/trunk/debian/changelog
===================================================================
--- packages/paste/trunk/debian/changelog	2011-09-22 13:34:58 UTC (rev 18670)
+++ packages/paste/trunk/debian/changelog	2011-09-22 18:58:50 UTC (rev 18671)
@@ -1,3 +1,12 @@
+paste (1.7.5.1-3) unstable; urgency=low
+
+  * Remove .pth file (introduced in last upload by accident)
+  * Add build-indep and build-arch targets 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>  Thu, 22 Sep 2011 20:10:40 +0200
+
 paste (1.7.5.1-2) unstable; urgency=low
 
   * objects.inv is no longer compressed (closes: #608759)

Modified: packages/paste/trunk/debian/control
===================================================================
--- packages/paste/trunk/debian/control	2011-09-22 13:34:58 UTC (rev 18670)
+++ packages/paste/trunk/debian/control	2011-09-22 18:58:50 UTC (rev 18671)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: python-all (>= 2.6.6-3),
- python-setuptools (>= 0.6b3-1~), python-sphinx
+ python-setuptools (>= 0.6b3-1~), python-sphinx (>= 1.0.7+dfsg-1~)
 Standards-Version: 3.9.2
 Homepage: http://pythonpaste.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/paste/trunk/
@@ -18,7 +18,7 @@
 Recommends: python-ctypes, python-openid, python-openssl, python-scgi, libjs-mochikit
 Suggests: python-pastedeploy, python-pastescript, python-pastewebkit,
  libapache2-mod-wsgi, libapache2-mod-python (>= 3.2.8-3), libapache2-mod-scgi,
- python-pgsql (>= 2.5.1-1), libjs-jquery
+ python-pgsql (>= 2.5.1-1), ${sphinxdoc:Depends}
 Description: tools for using a Web Server Gateway Interface stack
  Python Paste brings consistency to Python web development and web application
  installation, providing tools for both developers and system administrators.

Modified: packages/paste/trunk/debian/rules
===================================================================
--- packages/paste/trunk/debian/rules	2011-09-22 13:34:58 UTC (rev 18670)
+++ packages/paste/trunk/debian/rules	2011-09-22 18:58:50 UTC (rev 18671)
@@ -14,15 +14,14 @@
 	find . -name *\.py[co] -delete
 	dh_clean build-docs* $(PYVERS:%=install-python%)
 
-build: build-docs
+build: build-indep
+build-indep: build-docs
+build-arch:
 
 build-docs:
 	dh_testdir
 	dh_installdirs
 	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ $(PKGDIR)/usr/share/doc/python-paste/docs/
-	rm -rf $(PKGDIR)/usr/share/doc/python-paste/docs/.doctrees
-	dh_link /usr/share/javascript/jquery/jquery.js \
-		/usr/share/doc/python-paste/docs/_static/jquery.js
 	touch $@
 
 install: $(PYVERS:%=install-python%)
@@ -30,7 +29,7 @@
 	python$* setup.py install --root $(PKGDIR) \
 		--single-version-externally-managed $(py_setup_install_args)
 	# pth file is not needed since all paste* packages are installed in same directory
-	find $(PKGDIR) -name '*.pth' -or -name 'namespace_packages.txt' -delete
+	find $(PKGDIR) \( -name '*.pth' -or -name 'namespace_packages.txt' \) -delete
 	dh_link /usr/share/javascript/mochikit/MochiKit.js \
 		$(call py_libdir,$*)/paste/evalexception/media/MochiKit.packed.js
 	touch $@
@@ -40,6 +39,7 @@
 	dh_testroot -i
 	dh_installchangelogs -i docs/news.txt
 	dh_installdocs -i
+	dh_sphinxdoc -i
 	dh_python2 -i
 	# it's not an extra license file
 	echo "python-paste: extra-license-file usr/share/doc/python-paste/docs/_sources/license.txt" \
@@ -55,4 +55,4 @@
 
 binary: binary-indep binary-arch
 
-.PHONY: build clean binary-indep binary-arch binary install build
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install