bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/fix-newer-bzr into lp:bzr-builddeb

  1. fix-newer-bzr
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Rejected
Rejected by: Jelmer Vernooij
Proposed branch: lp:~jelmer/bzr-builddeb/fix-newer-bzr
Merge into: lp:bzr-builddeb
Diff against target: 28 lines (+4/-2)
2 files modified
debian/changelog (+3/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/fix-newer-bzr
Reviewer Review Type Date Requested Status
Max Bowsher (community) Needs Fixing
Review via email: mp+59605@code.launchpad.net

Description of the change

Support building against newer versions of bzr that have a separate package
for the testsuite.

To post a comment you must log in.
Revision history for this message
Max Bowsher (maxb) wrote :

Sorry for preempting this without noticing. I suggest you merge trunk, reverting my change replacing it with yours.

The change you have here is fine, except that the alternatives need to be the other way around, because sbuild is insufficiently clever.

review: Needs Fixing

Unmerged revisions

556. By Jelmer Vernooij

Add build dependency on python-bzrlib.tests, required for newer
versions of bzr.

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-04-29 22:32:59 +0000
3+++ debian/changelog 2011-05-01 01:26:34 +0000
4@@ -7,8 +7,10 @@
5 * Use --create when merging a new upstream into a branch that doesn't have a
6 changelog file. LP: #385667
7 * Fix merging of upstream in new packages. LP: #772225
8+ * Add build dependency on python-bzrlib.tests, required for newer
9+ versions of bzr.
10
11- -- Jelmer Vernooij <jelmer@debian.org> Fri, 29 Apr 2011 14:33:48 +0200
12+ -- Jelmer Vernooij <jelmer@debian.org> Sun, 01 May 2011 03:23:40 +0200
13
14 bzr-builddeb (2.7.3) unstable; urgency=low
15
16
17=== modified file 'debian/control'
18--- debian/control 2011-03-07 11:36:07 +0000
19+++ debian/control 2011-05-01 01:26:34 +0000
20@@ -4,7 +4,7 @@
21 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
22 Uploaders: Reinhard Tartler <siretart@tauware.de>, James Westby <james.westby@ubuntu.com>, Jelmer Vernooij <jelmer@debian.org>
23 Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.6.6-3)
24-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
25+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, bzr (<< 2.4.0~beta1-2) | python-bzrlib.tests
26 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
27 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
28 X-Python-Version: >= 2.4

Subscribers

People subscribed via source and target branches