Merge lp:~jelmer/bzr-builddeb/dh_python2 into lp:bzr-builddeb

Proposed by Jelmer Vernooij
Status: Merged
Approved by: James Westby
Approved revision: 536
Merged at revision: 538
Proposed branch: lp:~jelmer/bzr-builddeb/dh_python2
Merge into: lp:bzr-builddeb
Diff against target: 55 lines (+8/-6)
3 files modified
debian/changelog (+4/-1)
debian/control (+3/-4)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/dh_python2
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+52397@code.launchpad.net

Description of the change

Switch to dh_python2.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-01 12:17:01 +0000
+++ debian/changelog 2011-03-07 11:41:45 +0000
@@ -44,7 +44,10 @@
4444
45 * Add devscripts to Build-Depends-Indep, the test suite runs dch.45 * Add devscripts to Build-Depends-Indep, the test suite runs dch.
4646
47 -- Jelmer Vernooij <jelmer@debian.org> Sun, 27 Feb 2011 03:08:09 +010047 [ Jelmer Vernooij ]
48 * Switch to dh_python2. Closes: #616752
49
50 -- Jelmer Vernooij <jelmer@debian.org> Mon, 07 Mar 2011 12:28:08 +0100
4851
49bzr-builddeb (2.6) unstable; urgency=low52bzr-builddeb (2.6) unstable; urgency=low
5053
5154
=== modified file 'debian/control'
--- debian/control 2011-03-01 11:49:32 +0000
+++ debian/control 2011-03-07 11:41:45 +0000
@@ -3,11 +3,11 @@
3Priority: optional3Priority: optional
4Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>4Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
5Uploaders: Reinhard Tartler <siretart@tauware.de>, James Westby <james.westby@ubuntu.com>, Jelmer Vernooij <jelmer@debian.org>5Uploaders: Reinhard Tartler <siretart@tauware.de>, James Westby <james.westby@ubuntu.com>, Jelmer Vernooij <jelmer@debian.org>
6Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)6Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.6.6-3)
7Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts, python-subunit7Build-Depends-Indep: bzr (>= 2.1~), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts, python-subunit
8Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable8Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
9Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable9Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
10XS-Python-Version: >= 2.410X-Python-Version: >= 2.4
11Standards-Version: 3.9.111Standards-Version: 3.9.1
1212
13Package: bzr-builddeb13Package: bzr-builddeb
@@ -16,7 +16,6 @@
16Recommends: python-launchpadlib16Recommends: python-launchpadlib
17Suggests: bzr-svn (>= 0.4.10)17Suggests: bzr-svn (>= 0.4.10)
18Provides: bzr-buildpackage18Provides: bzr-buildpackage
19XB-Python-Version: ${python:Versions}
20Description: bzr plugin for Debian package management19Description: bzr plugin for Debian package management
21 bzr-builddeb is a plugin for the bzr version control system that helps to20 bzr-builddeb is a plugin for the bzr version control system that helps to
22 automate the task of maintaining Debian packages using bzr. It is similar21 automate the task of maintaining Debian packages using bzr. It is similar
2322
=== modified file 'debian/rules'
--- debian/rules 2011-02-28 17:16:55 +0000
+++ debian/rules 2011-03-07 11:41:45 +0000
@@ -66,7 +66,7 @@
66 dh_installexamples66 dh_installexamples
67 dh_compress67 dh_compress
68 dh_fixperms68 dh_fixperms
69 dh_pycentral69 dh_python2
70 dh_installdeb70 dh_installdeb
71 dh_shlibdeps71 dh_shlibdeps
72 dh_gencontrol72 dh_gencontrol

Subscribers

People subscribed via source and target branches