diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-09-04 14:56:01 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-09-04 14:56:01 +0200 |
| commit | 85909fca550d03b0e215d16cdd701190b43ff63c (patch) | |
| tree | b6767be7b1898830499b0a5fb8153460223b5649 /debian | |
| parent | ac5b5e826ab405935dc257c0a0984ae39b02bc23 (diff) | |
| parent | 89e95aee05c7f2fde7eb11261df9697a4896b49b (diff) | |
merged sftp://bzr.debian.org/bzr/apt/apt/debian-sid
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 31 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 30 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 48c08a1e0..7ee04b21b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.9.7.5ubuntu2) UNRELEASED; urgency=low - Merged from lp:~donkult/apt/experimental + Merged from lp:~donkult/apt/experimental, + sftp://bzr.debian.org/bzr/apt/apt/debian-sid [ David Kalnischkies ] * apt-pkg/contrib/strutl.cc: @@ -29,7 +30,33 @@ apt (0.9.7.5) UNRELEASED; urgency=low [ Manpages translation updates ] * Japanese (KURASAWA Nozomu) (Closes: #684435) - -- Christian Perrier <bubulle@debian.org> Fri, 10 Aug 2012 07:52:17 +0200 + [ David Kalnischkies ] + * apt-pkg/cdrom.cc: + - copy only configured translation files from a CD-ROM and not all + available translation files preventing new installs with d-i from + being initialized with all translations (Closes: #678227) + - handle Components in the reduction for the source.list as multi-arch CDs + otherwise create duplicated source entries (e.g. "wheezy main main") + * apt-pkg/packagemanager.cc: + - unpack versions only in case a different version from the package + is currently in unpack state to recover from broken system states + (like different file in M-A:same package and other dpkg errors) + and avoid re-unpack otherwise (Closes: #670900) + * debian/control: + - let libapt-pkg break apt < 0.9.4 to ensure that the installed http- + method supports the new redirection-style, thanks to Raphael Geissert + for reporting & testing (Closes: #685192) + * doc/apt_preferences.5.xml: + - use the correct interval (x <= P < y) for pin value documentation as + these are the intervals used by the code (Closes: #685989) + * apt-pkg/indexcopy.cc: + - do not create duplicated flat-archive CD-ROM sources for foreign + architectures on multi-arch CD-ROMs + - do not warn about files which have a record in the Release file, but + are not present on the CD to mirror the behavior of the other methods + and to allow uncompressed indexes to be dropped without scaring users + + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 26 Aug 2012 10:49:17 +0200 apt (0.9.7.4) unstable; urgency=low diff --git a/debian/control b/debian/control index b793d3f04..8834079a2 100644 --- a/debian/control +++ b/debian/control @@ -42,6 +42,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: apt (<< 0.9.4~) Section: libs Description: package managment runtime library This library provides the common functionality for searching and |