Merge lp:~jamesodhunt/ubuntu/trusty/pbuilder/build-depend-on-libcap-dev-for-procenv-0.33 into lp:ubuntu/trusty/pbuilder

Proposed by James Hunt
Status: Approved
Approved by: Martin Pitt
Approved revision: 63
Proposed branch: lp:~jamesodhunt/ubuntu/trusty/pbuilder/build-depend-on-libcap-dev-for-procenv-0.33
Merge into: lp:ubuntu/trusty/pbuilder
Diff against target: 23 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/tests/control (+1/-1)
To merge this branch: bzr merge lp:~jamesodhunt/ubuntu/trusty/pbuilder/build-depend-on-libcap-dev-for-procenv-0.33
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+211365@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Uploaded.

review: Approve

Unmerged revisions

63. By James Hunt

debian/tests/control: build-depend on libcap-dev since procenv 0.33 now
uses that.

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 2014-03-05 14:40:22 +0000
3+++ debian/changelog 2014-03-17 16:41:27 +0000
4@@ -1,3 +1,10 @@
5+pbuilder (0.215ubuntu7) UNRELEASED; urgency=medium
6+
7+ * debian/tests/control: build-depend on libcap-dev since procenv 0.33 now
8+ uses that.
9+
10+ -- James Hunt <james.hunt@ubuntu.com> Mon, 17 Mar 2014 16:05:04 +0000
11+
12 pbuilder (0.215ubuntu6) trusty; urgency=medium
13
14 * debian/tests/build_procenv: Use first remote url from sources.list
15
16=== modified file 'debian/tests/control'
17--- debian/tests/control 2014-03-05 14:40:22 +0000
18+++ debian/tests/control 2014-03-17 16:41:27 +0000
19@@ -1,3 +1,3 @@
20 Tests: build_procenv
21-Depends: @, debian-keyring, distro-info, lsb-release, haveged, libnuma1 [linux-i386 linux-amd64 linux-ia64 linux-mips linux-mipsel linux-powerpc linux-ppc64 linux-ppc64el linux-x32]
22+Depends: @, debian-keyring, distro-info, lsb-release, haveged, libnuma1 [linux-i386 linux-amd64 linux-ia64 linux-mips linux-mipsel linux-powerpc linux-ppc64 linux-ppc64el linux-x32], libcap-dev [linux-any]
23 Restrictions: needs-root

Subscribers

People subscribed via source and target branches

to all changes: