Merge lp:~lifeless/ubuntu/oneiric/apt/bug-816606 into lp:ubuntu/oneiric/apt

Proposed by Robert Collins on 2011-08-03
Status: Merged
Merge reported by: Robert Collins
Merged at revision: not available
Proposed branch: lp:~lifeless/ubuntu/oneiric/apt/bug-816606
Merge into: lp:ubuntu/oneiric/apt
Diff against target: 31 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~lifeless/ubuntu/oneiric/apt/bug-816606
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-08-03 Pending
Review via email: mp+70250@code.launchpad.net

Description of the change

Fix debootstrap / ensemble bootstrap / lxc bootstrapping of oneiric.

To post a comment you must log in.

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-07-13 14:42:02 +0000
3+++ debian/changelog 2011-08-03 04:53:26 +0000
4@@ -1,3 +1,10 @@
5+apt (0.8.15.1ubuntu3) natty; urgency=low
6+
7+ * Depend rather than recommending ubuntu-keyring, so that postinst can
8+ reliably work. (Debian depend rather than recommending). (LP: #816606)
9+
10+ -- Robert Collins <robertc@robertcollins.net> Wed, 03 Aug 2011 16:33:39 +1200
11+
12 apt (0.8.15.1ubuntu2) oneiric; urgency=low
13
14 [ Brian Murray ]
15
16=== modified file 'debian/control'
17--- debian/control 2011-06-29 09:03:39 +0000
18+++ debian/control 2011-08-03 04:53:26 +0000
19@@ -14,10 +14,10 @@
20
21 Package: apt
22 Architecture: any
23-Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg
24+Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg,
25+ ubuntu-keyring
26 Replaces: manpages-pl (<< 20060617-3~)
27 Provides: ${libapt-pkg:provides}
28-Recommends: ubuntu-keyring
29 Conflicts: python-apt (<< 0.7.93.2~)
30 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
31 Description: Advanced front-end for dpkg

Subscribers

People subscribed via source and target branches