diff -u migrate-0.5.4/debian/changelog migrate-0.5.4/debian/changelog
--- migrate-0.5.4/debian/changelog
+++ migrate-0.5.4/debian/changelog
@@ -1,3 +1,21 @@
+migrate (0.5.4-3) unstable; urgency=low
+
+  * switch to dh7
+  * debian/control:
+    - Build-Depends: increase minimum debhelper version to 7.0.50
+    - add ${misc:Depends} to python-migrate's Depends
+    - remove XB-Python-Version
+  * add debian/install.tmpl:
+    - used as base for generating debian/install
+  * debian/compat:
+    - 5 -> 7
+  * debian/rules:
+    - change handling of .egg-info (Closes: #552921)
+    - move all customizations to override_dh_* rules
+    - generate debian/install to install template files
+
+ -- Jan Dittberner <jandd@debian.org>  Thu, 29 Oct 2009 12:40:14 +0100
+
 migrate (0.5.4-2) unstable; urgency=low
 
   * debian/control:
diff -u migrate-0.5.4/debian/compat migrate-0.5.4/debian/compat
--- migrate-0.5.4/debian/compat
+++ migrate-0.5.4/debian/compat
@@ -1 +1 @@
-5
+7
diff -u migrate-0.5.4/debian/rules migrate-0.5.4/debian/rules
--- migrate-0.5.4/debian/rules
+++ migrate-0.5.4/debian/rules
@@ -2,24 +2,25 @@
 
 #export DH_VERBOSE=1
 include /usr/share/python/python.mk
-include /usr/share/quilt/quilt.make
 
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
 	| sed -rne 's,^Version: ([^-]+).*,\1,p')
 DOCS=$(shell find docs/ -name "*.rst" -printf "%p ")
+PYLIBDIR=$(call py_libdir,$(shell pyversions -d))
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
+%:
+	dh --with quilt $@
+
+override_dh_auto_clean:
 	rm -rf dist build
 	find . -name '*\.py[co]' -exec rm {} \;
-	rm -f docs/reference.txt
-	dh_clean build-*
+	rm -f docs/reference.txt debian/install
 
-build: $(QUILT_STAMPFN) build-indep
+override_dh_auto_build:
+	python setup.py install --root=$(CURDIR)/debian/python-migrate --install-layout=deb \
+	  --single-version-externally-managed
 
-build-indep:
-	dh_installdirs -i
+override_dh_install:
 	# install documentation
 	cp -R $(DOCS) docs/conf.py debian/python-migrate/usr/share/doc/python-migrate/
 	PYTHONPATH=$(CURDIR) sphinx-build -b html -a -E -N \
@@ -35,34 +36,13 @@
-	touch $@
-
-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$(call py_libdir,$(shell pyversions -d))/sqlalchemy_migrate-${DEB_UPSTREAM_VERSION}-py$(shell pyversions -d|sed 's/python//').egg-info \
-	  debian/python-migrate$(call py_libdir,$(shell pyversions -d))/sqlalchemy_migrate-${DEB_UPSTREAM_VERSION}.egg-info
+	cp debian/install.tmpl debian/install
+	find migrate/versioning/templates -type f ! -name '*.py' | while read name; do \
+		echo "$$name $(PYLIBDIR)/`dirname $$name`" >> debian/install; \
+	done
+	dh_install
 	# make lintian happy
-	chmod +x debian/python-migrate$(call py_libdir,$(shell pyversions -d))/migrate/versioning/templates/manage.py_tmpl
+	chmod +x debian/python-migrate$(PYLIBDIR)/migrate/versioning/templates/manage.py_tmpl
 
-binary-indep: install
-	dh_testdir -i
-	dh_testroot -i
+override_dh_installchangelogs:
 	dh_installchangelogs -i CHANGELOG
-	dh_installdocs -i
-	dh_installman -i
-	dh_pysupport -i
-	rm -rf debian/python-migrate/usr/lib
-	dh_install debian/migrate /usr/bin/
-	dh_install debian/migrate-repository /usr/bin
-	dh_compress -i -X.py -X.rst -X.js
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb
 
-binary-arch:
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_compress:
+	dh_compress -i -X.py -X.rst -X.js
diff -u migrate-0.5.4/debian/control migrate-0.5.4/debian/control
--- migrate-0.5.4/debian/control
+++ migrate-0.5.4/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jan Dittberner <jandd@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), quilt
+Build-Depends: debhelper (>= 7.0.50), quilt
 Build-Depends-Indep: python (>= 2.5.4-1~), python-support (>= 0.6.4),
  python-setuptools (>= 0.6b3), python-codespeak-lib,
  python-sphinx (>= 0.6.1), python-sqlalchemy (>= 0.5.1), python-decorator
@@ -15,10 +15,9 @@
 
 Package: python-migrate
 Architecture: all
-Depends: ${python:Depends}, python-sqlalchemy (>= 0.5.1),
+Depends: ${python:Depends}, ${misc:Depends}, python-sqlalchemy (>= 0.5.1),
  python-pkg-resources, python-codespeak-lib, libjs-jquery,
  python-decorator
-XB-Python-Version: ${python:Versions}
 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.
only in patch2:
unchanged:
--- migrate-0.5.4.orig/debian/install.tmpl
+++ migrate-0.5.4/debian/install.tmpl
@@ -0,0 +1,2 @@
+debian/migrate /usr/bin
+debian/migrate-repository /usr/bin