diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-11 09:14:02 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-11 09:14:02 +0200 |
| commit | 180691bee7484f25d9879a77f577537ae1d98907 (patch) | |
| tree | 845c06c2fdf0215902b7b08cf8c91dcdbad6c20d /debian | |
| parent | 5368af78fb6c996c8ee24e5cf8f645cf00259ead (diff) | |
| parent | 22041bd2864b8d0b401b45dde9eda4003a11fec4 (diff) | |
merged from the debian-experimental-ma branch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e90aebef6..0ca0f285a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/contrib/fileutl.cc: + - Add WriteAtomic mode. + - Revert WriteEmpty to old behavior (LP: #613211) + * apt-pkg, methods: + - Convert users of WriteEmpty to WriteAtomic. + * apt-pkg/depcache.cc: + - Only try upgrade for Breaks if there is a newer version, otherwise + handle it as Conflicts (by removing it) (helps for #591882). + + [ Michael Vogt ] + * debian/control: + - Add recommends on gnupg to apt, apt-key uses it. + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 17:37:14 +0200 + apt (0.7.26~exp12ubuntu3) maverick; urgency=low [ Colin Watson ] diff --git a/debian/control b/debian/control index 534473a29..c1283f7d2 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} -Recommends: ubuntu-keyring +Recommends: ubuntu-keyring, gpg Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg |