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

[piotr at users.alioth.debian.org]

    Date: Monday, May 18, 2009 @ 18:27:19
  Author: piotr
Revision: 8515

* New upstream release
* build-docs rule enabled again
  + python-sphinx minimum required version bumped to 0.6
  + python-mako added to Build-Depends-Indep

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

Modified: packages/sqlalchemy/trunk/debian/changelog
===================================================================
--- packages/sqlalchemy/trunk/debian/changelog	2009-05-18 11:47:46 UTC (rev 8514)
+++ packages/sqlalchemy/trunk/debian/changelog	2009-05-18 18:27:19 UTC (rev 8515)
@@ -1,3 +1,12 @@
+sqlalchemy (0.5.4p1-1) unstable; urgency=low
+
+  * New upstream release
+  * build-docs rule enabled again
+    + python-sphinx minimum required version bumped to 0.6
+    + python-mako added to Build-Depends-Indep
+
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 18 May 2009 19:32:31 +0200
+
 sqlalchemy (0.5.3-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/sqlalchemy/trunk/debian/control
===================================================================
--- packages/sqlalchemy/trunk/debian/control	2009-05-18 11:47:46 UTC (rev 8514)
+++ packages/sqlalchemy/trunk/debian/control	2009-05-18 18:27:19 UTC (rev 8515)
@@ -5,8 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.38)
 Build-Depends-Indep: python-all (>= 2.5.4-1~), python-support (>= 0.6.4),
- python-setuptools (>= 0.6b3-1~)
-#, python-sphinx (>= 0.6)
+ python-setuptools (>= 0.6b3-1~), python-sphinx (>= 0.6), python-mako
 Standards-Version: 3.8.1
 Homepage: http://www.sqlalchemy.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sqlalchemy/trunk

Modified: packages/sqlalchemy/trunk/debian/rules
===================================================================
--- packages/sqlalchemy/trunk/debian/rules	2009-05-18 11:47:46 UTC (rev 8514)
+++ packages/sqlalchemy/trunk/debian/rules	2009-05-18 18:27:19 UTC (rev 8515)
@@ -20,21 +20,15 @@
 build-docs:
 	dh_testdir
 	dh_installdirs
-	PYTHONPATH=. sphinx-build -N -q -E -b html doc/build/ \
+	cd doc/build && sphinx-build -N -q -E -b html . \
 	 $(CURDIR)/debian/${p_name}-doc/usr/share/doc/${p_name}-doc/html/
 	rm -rf $(CURDIR)/debian/${p_name}-doc/usr/share/doc/${p_name}-doc/html/.doctrees
 	touch $@
 
-#install-docs: build-docs
-install-docs:
+install-docs: build-docs
 	dh_testdir
 	dh_installdirs
 	
-	# TODO: use build-docs rule instead (once Sphinx 0.6 will be released):
-	dh_install -p${p_name}-doc doc/* \
-		--exclude=doc/build --exclude=doc/_sources \
-		/usr/share/doc/${p_name}-doc/html/
-	
 	dh_install -p${p_name}-doc doc/_sources/* \
 	       	/usr/share/doc/${p_name}-doc/rst
 	dh_link -p${p_name}-doc /usr/share/javascript/jquery/jquery.js \