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

Proposed by Barry Warsaw on 2011-01-21
Status: Needs review
Proposed branch: lp:~barry/daily-journal/bug-706051
Merge into: lp:daily-journal
Diff against target: 26 lines (+8/-4)
2 files modified
debian/changelog (+6/-0)
debian/rules (+2/-4)
To merge this branch: bzr merge lp:~barry/daily-journal/bug-706051
Reviewer Review Type Date Requested Status
Rick Spencer 2011-01-21 Pending
Review via email: mp+47089@code.launchpad.net

Description of the change

* Use the dh_python2 built system.

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

To post a comment you must log in.

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-28 17:23:24 +0000
3+++ debian/changelog 2011-01-21 20:12:54 +0000
4@@ -1,3 +1,9 @@
5+daily-journal (10.09.1) natty; urgency=low
6+
7+ * Use the dh_python2 built system.
8+
9+ -- Barry Warsaw <barry@ubuntu.com> Fri, 21 Jan 2011 14:59:04 -0500
10+
11 daily-journal (10.09) maverick; urgency=low
12
13 * forgot to set the title from change_note
14
15=== modified file 'debian/rules'
16--- debian/rules 2010-07-15 10:52:53 +0000
17+++ debian/rules 2011-01-21 20:12:54 +0000
18@@ -1,6 +1,4 @@
19 #!/usr/bin/make -f
20-DEB_PYTHON_SYSTEM := pysupport
21
22-include /usr/share/cdbs/1/rules/debhelper.mk
23-include /usr/share/cdbs/1/class/python-distutils.mk
24-include /usr/share/cdbs/1/rules/langpack.mk
25+%:
26+ dh $@ --with python2

Subscribers

People subscribed via source and target branches

to all changes: