Merge lp:~barry/daily-journal/bug-706051 into lp:daily-journal

[Barry Warsaw]

* Use the dh_python2 built system.

Note, as with bug 706044, you will have to tweak the version number in setup.py.

Unmerged revisions

67. By Barry Warsaw on 2011-01-21

fixes

66. By Barry Warsaw on 2011-01-21

Use the dh_python2 built system.

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-28 17:23:24 +0000
+++ debian/changelog	2011-01-21 20:12:54 +0000
@@ -1,3 +1,9 @@
+daily-journal (10.09.1) natty; urgency=low
+
+  * Use the dh_python2 built system.
+
+ -- Barry Warsaw <[e-mail]>  Fri, 21 Jan 2011 14:59:04 -0500
+
 daily-journal (10.09) maverick; urgency=low
 
   * forgot to set the title from change_note

=== modified file 'debian/rules'
--- debian/rules	2010-07-15 10:52:53 +0000
+++ debian/rules	2011-01-21 20:12:54 +0000
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM := pysupport
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/langpack.mk
+%:
+	dh $@ --with python2