diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-10 16:04:17 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-10 16:04:17 +0200 |
| commit | b472c6b08e0bfd1ea94390cd525cef579ea3ccee (patch) | |
| tree | 721bcf9bbe68590dc6409f4ba2bf85e2fac6a81f /debian | |
| parent | 47f6d1b72bc883ecdc00542da4c824a5c4fb79fa (diff) | |
| parent | 22041bd2864b8d0b401b45dde9eda4003a11fec4 (diff) | |
merge with debian-experimental-ma
* Swedish translation update. Closes: #592366
* apt-pkg/pkgcache.cc:
- re-evaluate the architectures cache when the cache is (re)opened
* apt-pkg/cdrom.cc:
- fix off-by-one error in DropBinaryArch
* 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).
* debian/control:
- Add dependency on gnupg to apt, apt-key uses it.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 21 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 69b1649c6..1207fb52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,29 @@ apt (0.8.0~pre1) UNRELASED; urgency=low + [ Programs translations ] + * Swedish translation update. Closes: #592366 + [ Michael Vogt ] * merge of the debian-expermental-ma branch * refresh po/pot files in doc/ and po/ + * apt-pkg/pkgcache.cc: + - re-evaluate the architectures cache when the cache is (re)opened - [ Programs translations ] - * Swedish translation update. Closes: #592366 + [ Colin Watson ] + * apt-pkg/cdrom.cc: + - fix off-by-one error in DropBinaryArch + + [ 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). + * debian/control: + - Add dependency on gnupg to apt, apt-key uses it. [ David Kalnischkies ] * apt-pkg/algorithms.cc: diff --git a/debian/control b/debian/control index dba0933b1..f03b96f67 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} +Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} Conflicts: python-apt (<< 0.7.93.2~) |