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

[piotr at users.alioth.debian.org]

    Date: Thursday, October 30, 2008 @ 21:46:27
  Author: piotr
Revision: 6803

* New upstream release (upload to experimental due to Lenny freeze, to ease
  testing rev. dependencies)
* Build docs using Sphinx:
  + python-sphinx replaced python-docutils build dependency
  + new suggested package: libjs-jquery

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

Modified: packages/pastescript/trunk/debian/changelog
===================================================================
--- packages/pastescript/trunk/debian/changelog	2008-10-30 20:36:14 UTC (rev 6802)
+++ packages/pastescript/trunk/debian/changelog	2008-10-30 21:46:27 UTC (rev 6803)
@@ -1,10 +1,14 @@
-pastescript (1.7-1) unstable; urgency=low
+pastescript (1.7-1) experimental; urgency=low
 
-  * New upstream release
+  * New upstream release (upload to experimental due to Lenny freeze, to ease
+    testing rev. dependencies)
   * Update patches/02_rename_templates_dir patch and debian/rules to handle
     new directory name
   * Add lintian override for license.txt_tmpl (template detected as extra
     license file)
+  * Build docs using Sphinx:
+    + python-sphinx replaced python-docutils build dependency
+    + new suggested package: libjs-jquery
   * Add bash completion for paster
 
  -- Piotr Ożarowski <piotr at debian.org>  Thu, 30 Oct 2008 19:41:02 +0100

Modified: packages/pastescript/trunk/debian/control
===================================================================
--- packages/pastescript/trunk/debian/control	2008-10-30 20:36:14 UTC (rev 6802)
+++ packages/pastescript/trunk/debian/control	2008-10-30 21:46:27 UTC (rev 6803)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4),
- python-setuptools (>= 0.6b3-1~), python-docutils, python-paste, python-pastedeploy
+ python-setuptools (>= 0.6b3-1~), python-sphinx, python-paste, python-pastedeploy
 Standards-Version: 3.8.0
 Homepage: http://pythonpaste.org/script/
 XS-Python-Version: >= 2.4
@@ -17,7 +17,7 @@
 Depends: ${python:Depends}, python-paste (>= 1.6-1),
  python-pastedeploy (>= 1.3.1-2), python-setuptools (>= 0.6b3)
 Recommends: python-flup (>= 0.5-1), python-cheetah (>= 1.0-1.1)
-Suggests: python-cherrypy3 | python-cherrypy
+Suggests: python-cherrypy3 | python-cherrypy, libjs-jquery
 Description: serving web applications, creating file layouts for Python packages
  Paster is pluggable command-line frontend,
  including commands to setup package file layouts

Modified: packages/pastescript/trunk/debian/rules
===================================================================
--- packages/pastescript/trunk/debian/rules	2008-10-30 20:36:14 UTC (rev 6802)
+++ packages/pastescript/trunk/debian/rules	2008-10-30 21:46:27 UTC (rev 6803)
@@ -4,7 +4,6 @@
 
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 PYVERS=$(shell pyversions -vr)
-DOCS=$(shell cd docs && find ./ -maxdepth 1 -name "*.txt" -not -name "license.txt" -printf "%p " | sed "s/.txt//g")
 PKGDIR=$(CURDIR)/debian/python-pastescript
 
 include /usr/share/dpatch/dpatch.make 
@@ -19,12 +18,12 @@
 build: patch build-docs
 
 build-docs:
+	dh_testdir
 	dh_installdirs
-	for NAME in $(DOCS); do \
-	    rst2html --cloak-email-addresses --no-toc-backlinks "docs/$$NAME.txt" \
-	      > "$(PKGDIR)/usr/share/doc/python-pastescript/docs/$$NAME.html"; \
-	done
-	cp docs/*ini $(PKGDIR)/usr/share/doc/python-pastescript/docs/
+	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ $(PKGDIR)/usr/share/doc/python-pastescript/docs/
+	rm -rf $(PKGDIR)/usr/share/doc/python-pastescript/docs/.doctrees
+	dh_link /usr/share/javascript/jquery/jquery.js \
+		/usr/share/doc/python-pastescript/docs/_static/jquery.js
 	touch $@
 
 install: build install-stamp
@@ -37,6 +36,8 @@
 	# it's a template only, not an extra license file
 	echo "python-pastescript: extra-license-file usr/share/paster_templates/basic_package/docs/license.txt_tmpl" \
 		>> $(PKGDIR)/usr/share/lintian/overrides/python-pastescript
+	echo "python-pastescript: extra-license-file usr/share/doc/python-pastescript/docs/_sources/license.txt" \
+		>> $(PKGDIR)/usr/share/lintian/overrides/python-pastescript
 	touch $@
 
 install-python%: patch
@@ -62,7 +63,7 @@
 	dh_installman -i 
 	dh_install scripts/paster /usr/bin/
 	dh_pysupport -i -X/usr/bin/paster
-	dh_compress -i -X.py
+	dh_compress -i -X.py -X.js
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i