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

[jandd at users.alioth.debian.org]

    Date: Tuesday, November 1, 2011 @ 22:36:28
  Author: jandd
Revision: 19144

  - add python-sphinxcontrib.issuetracker to Build-Depends-Indep
  - bump python-sphinx build dependency to >= 1.0.7~ (for dh_sphinxdoc)
  - bump python-sqlalchemy dependency to >= 0.6 (upstream support for
    older version has been dropped)
  - add libjs-sphinxdoc and ${sphinxdoc:Depends} to Depends
  - remove libjs-jquery from Depends (added automatically by
    dh_sphinxdoc)
  - remove treatment for manage.py_tmpl (removed from upstream release)
  - use dh_sphinxdoc
  - remove manual sphinx doc installation

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

Modified: packages/migrate/trunk/debian/changelog
===================================================================
--- packages/migrate/trunk/debian/changelog	2011-11-01 22:09:34 UTC (rev 19143)
+++ packages/migrate/trunk/debian/changelog	2011-11-01 22:36:28 UTC (rev 19144)
@@ -2,10 +2,18 @@
 
   * New upstream release.
   * debian/control:
-    - add python-sphinxcontrib.issuetracker to Depends
+    - add python-sphinxcontrib.issuetracker to Build-Depends-Indep
     - drop X-Python-Version
+    - bump python-sphinx build dependency to >= 1.0.7~ (for dh_sphinxdoc)
+    - bump python-sqlalchemy dependency to >= 0.6 (upstream support for
+      older version has been dropped)
+    - add libjs-sphinxdoc and ${sphinxdoc:Depends} to Depends
+    - remove libjs-jquery from Depends (added automatically by
+      dh_sphinxdoc)
   * debian/rules:
-    - remove treatment for manage.py_tmpl (removed from upstream released)
+    - remove treatment for manage.py_tmpl (removed from upstream release)
+    - use dh_sphinxdoc
+    - remove manual sphinx doc installation
 
  -- Jan Dittberner <jandd at debian.org>  Tue, 01 Nov 2011 22:45:22 +0100
 

Modified: packages/migrate/trunk/debian/control
===================================================================
--- packages/migrate/trunk/debian/control	2011-11-01 22:09:34 UTC (rev 19143)
+++ packages/migrate/trunk/debian/control	2011-11-01 22:36:28 UTC (rev 19144)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: python (>= 2.6.5~), python-setuptools (>= 0.6b3),
- python-sphinx (>= 0.6.1), python-sqlalchemy (>= 0.5.1), python-decorator,
+ python-sphinx (>= 1.0.7~), python-sqlalchemy (>= 0.6), python-decorator,
  python-tempita (>= 0.4), python-sphinxcontrib.issuetracker
 Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/sqlalchemy-migrate/
@@ -14,9 +14,9 @@
 
 Package: python-migrate
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-sqlalchemy (>=
- 0.5.1), python-pkg-resources, libjs-jquery, python-decorator,
- python-tempita (>= 0.4)
+Depends: ${python:Depends}, ${misc:Depends}, ${sphinxdoc:Depends},
+ python-sqlalchemy (>= 0.6), python-pkg-resources, python-decorator,
+ python-tempita (>= 0.4), libjs-sphinxdoc
 Description: Database schema migration for SQLAlchemy
  Inspired by Ruby on Rails' migrations, migrate provides a way to deal
  with database schema changes in SQLAlchemy projects.

Modified: packages/migrate/trunk/debian/rules
===================================================================
--- packages/migrate/trunk/debian/rules	2011-11-01 22:09:34 UTC (rev 19143)
+++ packages/migrate/trunk/debian/rules	2011-11-01 22:36:28 UTC (rev 19144)
@@ -9,31 +9,26 @@
 PYLIBDIR=$(call py_libdir,$(shell pyversions -d))
 
 %:
-	dh --with python2 --buildsystem=python_distutils $@
+	dh --with python2,sphinxdoc --buildsystem=python_distutils $@
 
 override_dh_auto_clean:
 	rm -rf dist build
 	find . -name '*\.py[co]' -exec rm {} \;
 	rm -f docs/reference.txt debian/install
 
-override_dh_install:
+override_dh_auto_install:
 	# install documentation
-	cp -R $(DOCS) docs/conf.py debian/python-migrate/usr/share/doc/python-migrate/
+	#cp -R $(DOCS) docs/conf.py \
+	#  debian/python-migrate/usr/share/doc/python-migrate/
 	PYTHONPATH=$(CURDIR) sphinx-build -b html -a -E -N \
-	  debian/python-migrate/usr/share/doc/python-migrate/ \
+	  docs/ \
 	  debian/python-migrate/usr/share/doc/python-migrate/html/
-	rm -rf \
-	  debian/python-migrate/usr/share/doc/python-migrate/html/.doctrees \
-	  debian/python-migrate/usr/share/doc/python-migrate/html/_sources \
-	  debian/python-migrate/usr/share/doc/python-migrate/html/_static/jquery.js \
-	  debian/python-migrate/usr/share/doc/python-migrate/conf.py
-	dh_link /usr/share/javascript/jquery/jquery.js \
-	  /usr/share/doc/python-migrate/html/_static/jquery.js
 	cp debian/install.tmpl debian/install
-	find migrate/versioning/templates -type f ! -name '*.py' | while read name; do \
+	find migrate/versioning/templates -type f ! -name '*.py' | \
+	while read name; do \
 		echo "$$name $(PYLIBDIR)/`dirname $$name`" >> debian/install; \
 	done
-	dh_install
+	dh_auto_install
 
 override_dh_installchangelogs:
 	dh_installchangelogs -i docs/changelog.rst