[Python-modules-commits] r7280 - in packages/sqlalchemy/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, January 6, 2009 @ 20:31:17
  Author: piotr
Revision: 7280

* New upstream release
    (disable build-docs rule untill Sphinx 0.6 will be released
* HTML documentation moved to /usr/share/doc/python-sqlalchemy/html,
  RST sources are available in /usr/share/doc/python-sqlalchemy/rst

Modified:
  packages/sqlalchemy/trunk/debian/changelog
  packages/sqlalchemy/trunk/debian/control
  packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.doc-base
  packages/sqlalchemy/trunk/debian/rules
Deleted:
  packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.dirs
  packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.docs

Modified: packages/sqlalchemy/trunk/debian/changelog
===================================================================
--- packages/sqlalchemy/trunk/debian/changelog	2009-01-06 18:30:57 UTC (rev 7279)
+++ packages/sqlalchemy/trunk/debian/changelog	2009-01-06 20:31:17 UTC (rev 7280)
@@ -1,8 +1,11 @@
-sqlalchemy (0.5.0~rc4+svn5557-1) UNRELEASED; urgency=low
+sqlalchemy (0.5.0-1) experimental; urgency=low
 
-  * New upstream snapshot
+  * New upstream release
     + disable_ez_setup patch removed (no longer needed)
     + generate documentation using Sphinx
+      (disable build-docs rule untill Sphinx 0.6 will be released
+  * HTML documentation moved to /usr/share/doc/python-sqlalchemy/html,
+    RST sources are available in /usr/share/doc/python-sqlalchemy/rst
   * Add get-orig-source rule
 
  -- Piotr Ożarowski <piotr at debian.org>  Tue, 30 Dec 2008 17:12:10 +0100

Modified: packages/sqlalchemy/trunk/debian/control
===================================================================
--- packages/sqlalchemy/trunk/debian/control	2009-01-06 18:30:57 UTC (rev 7279)
+++ packages/sqlalchemy/trunk/debian/control	2009-01-06 20:31:17 UTC (rev 7280)
@@ -5,7 +5,8 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.38)
 Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4),
- python-setuptools (>= 0.6b3-1~), python-sphinx (>= 0.6)
+ python-setuptools (>= 0.6b3-1~)
+#, python-sphinx (>= 0.6)
 Standards-Version: 3.8.0
 Homepage: http://www.sqlalchemy.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sqlalchemy/trunk

Deleted: packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.dirs
===================================================================
--- packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.dirs	2009-01-06 18:30:57 UTC (rev 7279)
+++ packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.dirs	2009-01-06 20:31:17 UTC (rev 7280)
@@ -1 +0,0 @@
-/usr/share/doc/python-sqlalchemy-doc/docs

Modified: packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.doc-base
===================================================================
--- packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.doc-base	2009-01-06 18:30:57 UTC (rev 7279)
+++ packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.doc-base	2009-01-06 20:31:17 UTC (rev 7280)
@@ -7,5 +7,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-sqlalchemy-doc/doc/index.html
-Files: /usr/share/doc/python-sqlalchemy-doc/doc/*.html
+Index: /usr/share/doc/python-sqlalchemy-doc/html/index.html
+Files: /usr/share/doc/python-sqlalchemy-doc/html/*.html

Deleted: packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.docs
===================================================================
--- packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.docs	2009-01-06 18:30:57 UTC (rev 7279)
+++ packages/sqlalchemy/trunk/debian/python-sqlalchemy-doc.docs	2009-01-06 20:31:17 UTC (rev 7280)
@@ -1 +0,0 @@
-doc

Modified: packages/sqlalchemy/trunk/debian/rules
===================================================================
--- packages/sqlalchemy/trunk/debian/rules	2009-01-06 18:30:57 UTC (rev 7279)
+++ packages/sqlalchemy/trunk/debian/rules	2009-01-06 20:31:17 UTC (rev 7280)
@@ -12,21 +12,41 @@
 	dh_testroot
 	rm -rf $(CURDIR)/lib/${m_name}.egg-info $(CURDIR)/build/
 	find . -name '*\.py[co]' -delete
-	dh_clean build-* $(PYVERS:%=install-python%)
+	dh_clean build-* $(PYVERS:%=install-python%) install-docs
 
-build: build-docs
+#build: build-docs
+build:
 
 build-docs:
 	dh_testdir
 	dh_installdirs
 	PYTHONPATH=. sphinx-build -N -q -E -b html doc/build/ \
-	 $(CURDIR)/debian/${p_name}-doc/usr/share/doc/${p_name}-doc/docs/
-	rm -rf $(CURDIR)/debian/${p_name}-doc/usr/share/doc/${p_name}-doc/docs/.doctrees
-	dh_link /usr/share/javascript/jquery/jquery.js \
-		/usr/share/doc/${p_name}-doc/docs/_static/jquery.js
+	 $(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: build $(PYVERS:%=install-python%)
+#install-docs: build-docs
+install-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 \
+		/usr/share/doc/${p_name}-doc/html/_static/jquery.js
+	# link docs in python-sqlalchemy's dir
+	dh_link -p${p_name}-doc /usr/share/doc/${p_name}-doc/html \
+		/usr/share/doc/${p_name}/html
+	dh_link -p${p_name}-doc /usr/share/doc/${p_name}-doc/rst \
+		/usr/share/doc/${p_name}/rst
+	touch $@
+
+install: build install-docs $(PYVERS:%=install-python%)
 install-python%:
 	python$* setup.py install \
 		--single-version-externally-managed \