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

[jandd-guest at users.alioth.debian.org]

    Date: Thursday, March 26, 2009 @ 21:48:30
  Author: jandd-guest
Revision: 8011

prepare for sphinx 0.6.1 upload

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	2009-03-26 21:37:30 UTC (rev 8010)
+++ packages/migrate/trunk/debian/changelog	2009-03-26 21:48:30 UTC (rev 8011)
@@ -2,10 +2,11 @@
 
   * don't compress .js files to make search in html docs possible
   * switch to python-support
-  * debian/control: update Standards-Version to 3.8.1 (no changes needed)
-  TODO:
-  * need to get rid of the pycentral stuff in debian/rules once sphinx is
-    switched to pysupport
+  * debian/control:
+    - update Standards-Version to 3.8.1 (no changes needed)
+    - depend and build depend on sphinx >= 0.6.1
+  * debian/rules:
+    - add --install-layout=deb
 
  -- Jan Dittberner <jan at dittberner.info>  Sun, 22 Mar 2009 23:43:18 +0100
 

Modified: packages/migrate/trunk/debian/control
===================================================================
--- packages/migrate/trunk/debian/control	2009-03-26 21:37:30 UTC (rev 8010)
+++ packages/migrate/trunk/debian/control	2009-03-26 21:48:30 UTC (rev 8011)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5.0.38)
 Build-Depends-Indep: python (>= 2.4), python-all-dev, python-central
  (>= 0.5.6), python-support (>= 0.6.4), python-setuptools (>= 0.6b3),
- python-codespeak-lib, python-sphinx (>= 0.5.1)
+ python-codespeak-lib, python-sphinx (>= 0.6.1)
 Standards-Version: 3.8.1
 XS-Python-Version: >= 2.4
 Homepage: http://code.google.com/p/sqlalchemy-migrate/
@@ -16,7 +16,7 @@
 Package: python-migrate
 Architecture: all
 Depends: ${python:Depends}, python-sqlalchemy (>= 0.5.1),
- python-pkg-resources, python-codespeak-lib, python-sphinx (>= 0.5.1)
+ python-pkg-resources, python-codespeak-lib, python-sphinx (>= 0.6.1)
 XB-Python-Version: ${python:Versions}
 Description: Database schema migration for SQLAlchemy
  Inspired by Ruby on Rails' migrations, migrate provides a way to deal

Modified: packages/migrate/trunk/debian/rules
===================================================================
--- packages/migrate/trunk/debian/rules	2009-03-26 21:37:30 UTC (rev 8010)
+++ packages/migrate/trunk/debian/rules	2009-03-26 21:48:30 UTC (rev 8011)
@@ -21,7 +21,8 @@
 	dh_installdirs -i
 	# install documentation
 	cp -R $(DOCS) docs/conf.py debian/python-migrate/usr/share/doc/python-migrate/
-	ln -s `pycentral pycentraldir python-sphinx`/sphinx/static debian/python-migrate/usr/share/doc/python-migrate/_static
+	ln -s /usr/share/sphinx/themes/basic/static \
+	  debian/python-migrate/usr/share/doc/python-migrate/_static
 	PYTHONPATH=`pwd` sphinx-build -b html -a -E -N \
 	  debian/python-migrate/usr/share/doc/python-migrate/ \
 	  debian/python-migrate/usr/share/doc/python-migrate/html/
@@ -30,17 +31,17 @@
 	  debian/python-migrate/usr/share/doc/python-migrate/html/_sources \
 	  debian/python-migrate/usr/share/doc/python-migrate/html/_static \
 	  debian/python-migrate/usr/share/doc/python-migrate/conf.py
-	dh_link `pycentral pycentraldir python-sphinx`/sphinx/static /usr/share/doc/python-migrate/html/_static
+	dh_link /usr/share/sphinx/themes/basic/static \
+	  /usr/share/doc/python-migrate/html/_static
 	touch $@
 
-install: build $(PYVERS:%=install-python%)
-install-python%:
-	python$* setup.py install \
-		--single-version-externally-managed \
+install: build
+	python setup.py install\
+		--no-compile --install-layout=deb\
 		--root $(CURDIR)/debian/python-migrate
 	# share Egg dir (remove versions from dirname)
-	mv debian/python-migrate/usr/lib/python$*/site-packages/sqlalchemy_migrate-${DEB_UPSTREAM_VERSION}-py$*.egg-info \
-	   debian/python-migrate/usr/lib/python$*/site-packages/sqlalchemy_migrate-${DEB_UPSTREAM_VERSION}.egg-info
+	#	mv debian/python-migrate/usr/lib/python$*/site-packages/sqlalchemy_migrate-${DEB_UPSTREAM_VERSION}-py$*.egg-info \
+	#   debian/python-migrate/usr/lib/python$*/site-packages/sqlalchemy_migrate-${DEB_UPSTREAM_VERSION}.egg-info
 	# make lintian happy
 	chmod +x debian/python-migrate/usr/lib/python$*/site-packages/migrate/versioning/templates/manage.py_tmpl