Merge lp:~blueyed/ubuntu-dev-tools/fix-956903 into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

Proposed by Daniel Hahler
Status: Merged
Merged at revision: 1296
Proposed branch: lp:~blueyed/ubuntu-dev-tools/fix-956903
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 32 lines (+6/-2)
2 files modified
debian/changelog (+6/-1)
pbuilder-dist (+0/-1)
To merge this branch: bzr merge lp:~blueyed/ubuntu-dev-tools/fix-956903
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+97878@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Merged.

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 2012-02-29 21:23:05 +0000
+++ debian/changelog 2012-03-16 14:04:19 +0000
@@ -1,11 +1,16 @@
1ubuntu-dev-tools (0.140) UNRELEASED; urgency=low1ubuntu-dev-tools (0.140) UNRELEASED; urgency=low
22
3 [ Stefano Rivera ]
3 * Bump Standards-Version to 3.9.3, no changes needed.4 * Bump Standards-Version to 3.9.3, no changes needed.
4 * Update machine-readable copyright Format to 1.0.5 * Update machine-readable copyright Format to 1.0.
5 * pbuilder-dist: Use the same chroot, whether the system-architecture was6 * pbuilder-dist: Use the same chroot, whether the system-architecture was
6 the supplied architecture or was chosen by default (LP: #943435)7 the supplied architecture or was chosen by default (LP: #943435)
78
8 -- Stefano Rivera <stefanor@debian.org> Sat, 25 Feb 2012 16:09:53 +02009 [ Daniel Hahler ]
10 * pbuilder-dist: Do not force default value for `--aptcache` argument
11 (LP: #956903)
12
13 -- Daniel Hahler <ubuntu@thequod.de> Fri, 16 Mar 2012 14:47:24 +0100
914
10ubuntu-dev-tools (0.139) unstable; urgency=low15ubuntu-dev-tools (0.139) unstable; urgency=low
1116
1217
=== modified file 'pbuilder-dist'
--- pbuilder-dist 2012-02-29 21:23:05 +0000
+++ pbuilder-dist 2012-03-16 14:04:19 +0000
@@ -218,7 +218,6 @@
218 '--%s' % self.operation,218 '--%s' % self.operation,
219 '--distribution', self.target_distro,219 '--distribution', self.target_distro,
220 '--buildresult', result,220 '--buildresult', result,
221 '--aptcache', '/var/cache/apt/archives/',
222 '--override-config',221 '--override-config',
223 ]222 ]
224223

Subscribers

People subscribed via source and target branches

to status/vote changes: