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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-01 12:17:01 +0000
3+++ debian/changelog 2011-03-07 11:41:45 +0000
4@@ -44,7 +44,10 @@
5
6 * Add devscripts to Build-Depends-Indep, the test suite runs dch.
7
8- -- Jelmer Vernooij <jelmer@debian.org> Sun, 27 Feb 2011 03:08:09 +0100
9+ [ Jelmer Vernooij ]
10+ * Switch to dh_python2. Closes: #616752
11+
12+ -- Jelmer Vernooij <jelmer@debian.org> Mon, 07 Mar 2011 12:28:08 +0100
13
14 bzr-builddeb (2.6) unstable; urgency=low
15
16
17=== modified file 'debian/control'
18--- debian/control 2011-03-01 11:49:32 +0000
19+++ debian/control 2011-03-07 11:41:45 +0000
20@@ -3,11 +3,11 @@
21 Priority: optional
22 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
23 Uploaders: Reinhard Tartler <siretart@tauware.de>, James Westby <james.westby@ubuntu.com>, Jelmer Vernooij <jelmer@debian.org>
24-Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)
25-Build-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-subunit
26+Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.6.6-3)
27+Build-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
28 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
29 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
30-XS-Python-Version: >= 2.4
31+X-Python-Version: >= 2.4
32 Standards-Version: 3.9.1
33
34 Package: bzr-builddeb
35@@ -16,7 +16,6 @@
36 Recommends: python-launchpadlib
37 Suggests: bzr-svn (>= 0.4.10)
38 Provides: bzr-buildpackage
39-XB-Python-Version: ${python:Versions}
40 Description: bzr plugin for Debian package management
41 bzr-builddeb is a plugin for the bzr version control system that helps to
42 automate the task of maintaining Debian packages using bzr. It is similar
43
44=== modified file 'debian/rules'
45--- debian/rules 2011-02-28 17:16:55 +0000
46+++ debian/rules 2011-03-07 11:41:45 +0000
47@@ -66,7 +66,7 @@
48 dh_installexamples
49 dh_compress
50 dh_fixperms
51- dh_pycentral
52+ dh_python2
53 dh_installdeb
54 dh_shlibdeps
55 dh_gencontrol

Subscribers

People subscribed via source and target branches