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

Thu Oct 30 21:47:21 UTC 2008

Date: Thursday, October 30, 2008 @ 21:47:20
  Author: piotr
Revision: 6804

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

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

Modified: packages/paste/trunk/debian/changelog
===================================================================

--- packages/paste/trunk/debian/changelog	2008-10-30 21:46:27 UTC (rev 6803)
+++ packages/paste/trunk/debian/changelog	2008-10-30 21:47:20 UTC (rev 6804)
@@ -1,6 +1,10 @@
-paste (1.7.2-1) unstable; urgency=low
+paste (1.7.2-1) experimental; urgency=low
 
-  * New upstream release
+  * New upstream release (upload to experimental due to Lenny freeze, to ease
+    testing rev. dependencies)
+  * Build docs using Sphinx: (Closes: #456554)
+    + python-sphinx replaced python-docutils build dependency
+    + new suggested packages: libjs-mochikit and libjs-jquery
 
  -- Piotr OÅ¼arowski <piotr at debian.org>  Wed, 29 Oct 2008 22:50:01 +0100
 

Modified: packages/paste/trunk/debian/control
===================================================================
--- packages/paste/trunk/debian/control	2008-10-30 21:46:27 UTC (rev 6803)
+++ packages/paste/trunk/debian/control	2008-10-30 21:47:20 UTC (rev 6804)
@@ -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, python-support (>= 0.6.4),
- python-setuptools (>= 0.6b3-1~), python-docutils
+ python-setuptools (>= 0.6b3-1~), python-sphinx
 Standards-Version: 3.8.0
 Homepage: http://pythonpaste.org/
 XS-Python-Version: >= 2.4
@@ -18,7 +18,8 @@
 Recommends: python-ctypes, python-openid, python-openssl, python-scgi
 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)
+ python-pgsql (>= 2.5.1-1),
+ libjs-mochikit, libjs-jquery
 Replaces: paste-common
 Conflicts: paste-common
 Description: Tools for using a Web Server Gateway Interface stack

Modified: packages/paste/trunk/debian/dirs
===================================================================
--- packages/paste/trunk/debian/dirs	2008-10-30 21:46:27 UTC (rev 6803)
+++ packages/paste/trunk/debian/dirs	2008-10-30 21:47:20 UTC (rev 6804)
@@ -1,2 +1,2 @@
-/usr/share/doc/python-paste/docs/community
-/usr/share/doc/python-paste/docs/download
+/usr/share/doc/python-paste/docs
+/usr/share/lintian/overrides

Modified: packages/paste/trunk/debian/rules
===================================================================
--- packages/paste/trunk/debian/rules	2008-10-30 21:46:27 UTC (rev 6803)
+++ packages/paste/trunk/debian/rules	2008-10-30 21:47:20 UTC (rev 6804)
@@ -4,7 +4,7 @@
 
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 PYVERS=$(shell pyversions -vr)
-DOCS=$(shell find docs/ -name "*.txt" -not -path "*/include/*" -printf "%p "| sed "s/.txt//g")
+PKGDIR=$(CURDIR)/debian/python-paste
 
 include /usr/share/dpatch/dpatch.make 
 
@@ -13,29 +13,19 @@
 	dh_testroot
 	rm -rf dist build
 	find . -name *\.py[co] -exec rm {} \;
-	dh_clean docs/reference.txt build-docs* $(PYVERS:%=install-python%)
+	dh_clean build-docs* $(PYVERS:%=install-python%)
 
 build: patch build-docs
 
 build-docs:
+	dh_testdir
 	dh_installdirs
-	for NAME in $(DOCS); do \
-	    rst2html --cloak-email-addresses --no-toc-backlinks "$$NAME.txt" \
-	      > "debian/python-paste/usr/share/doc/python-paste/$$NAME.html"; \
-	done
-	cp docs/include/reference_header.txt docs/reference.txt
-	echo ":extracted: `date`" >> docs/reference.txt
-	echo >> docs/reference.txt
-	rst2html docs/reference.txt > debian/python-paste/usr/share/doc/python-paste/docs/reference.html
+	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 $@
 
-build-docs-pudge:
-	# this rule will replace build-docs once python-buildutils will enter unstable
-	# TODO: add python-buildutils and python-pudge to Depends-Indep, close #456554
-	dh_installdirs
-	python setup.py pudge --dest debian/python-paste/usr/share/doc/python-paste/
-	touch $@
-
 install: $(PYVERS:%=install-python%)
 install-python%:
 	python$* setup.py install \
@@ -43,9 +33,6 @@
 		--root $(CURDIR)/debian/python-paste
 	# pth file is not needed since all paste* packages are installed in same directory
 	rm -f debian/python-paste/usr/lib/python$*/site-packages/Paste-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
-	# in paste-common package:
-	mkdir -p debian/paste-common/usr/lib/python$*/site-packages/paste/
-	cp paste/__init__.py debian/paste-common/usr/lib/python$*/site-packages/paste/
 	touch $@
 
 binary-indep: build install
@@ -54,7 +41,12 @@
 	dh_installchangelogs -i docs/news.txt
 	dh_installdocs -i
 	dh_pysupport -i
-	dh_compress -i -X.py
+	dh_link /usr/share/javascript/mochikit/MochiKit.js \
+		/usr/share/python-support/python-paste/paste/evalexception/mochikit/MochiKit.js
+	# it's not an extra license file
+	echo "python-paste: extra-license-file usr/share/doc/python-paste/docs/_sources/license.txt" \
+		>> $(PKGDIR)/usr/share/lintian/overrides/python-paste
+	dh_compress -i -X.py -X.js
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i


