diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 2 | ||||
| -rw-r--r-- | debian/changelog | 36 |
2 files changed, 26 insertions, 12 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 8016687c9..4507c6858 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -8,7 +8,7 @@ # Dir "/"; # - RootDir for all configuration files # -# Dir::Cache "var/apt/cache/"; +# Dir::Cache "var/cache/apt/"; # - Set apt package cache directory # # Dir::Cache::Archives "archives/"; diff --git a/debian/changelog b/debian/changelog index e524081c8..732d67cbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -apt (0.8.16~exp10) UNRELEASED; urgency=low +apt (0.8.16~exp10ubuntu1) UNRELEASED; urgency=low + + * merge from debian/experimental: + - new ABI + * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Jan 2012 09:05:16 +0100 + +apt (0.8.16~exp10) experimental; urgency=low [ David Kalnischkies ] * apt-pkg/depcache.cc: @@ -9,16 +17,15 @@ apt (0.8.16~exp10) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - check if dpkg supports multiarch with --assert-multi-arch and if it does be always explicit about the architecture + * apt-pkg/contrib/fileutl.h: + - store the offset in the internal fd before calculate size of + the zlib-handled file to jump back to this place again - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:29:07 +0100 - -apt (0.8.16~exp9ubuntu1) UNRELEASED; urgency=low - - * merge from debian/experimental: - - new ABI - * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON + [ Michael Vogt ] + * apt-pkg/contrib/fileutl.h: + - fix segfault triggered by the python-apt testsuite - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2011 16:51:36 +0100 + -- Michael Vogt <mvo@debian.org> Wed, 18 Jan 2012 12:52:26 +0100 apt (0.8.16~exp9) experimental; urgency=low @@ -452,6 +459,10 @@ apt (0.8.15.10) UNRELEASEDunstable; urgency=low - show a debug why a package was kept by ResolveByKeep() * doc/manpage-style.xml: - put <brackets> around email addresses + * apt-pkg/aptconfiguration.cc: + - parse dpkg --print-foreign-architectures correctly in + case archs are separated by newline instead of space, too. + (Closes: #655590) * doc/po/de.po: - apply typo-fix from Michael Basse, thanks! (LP: #900770) @@ -460,10 +471,13 @@ apt (0.8.15.10) UNRELEASEDunstable; urgency=low * doc/*.xml: - find and fix a bunch of misspellings - [ Program translation updatex ] + [ Program translation updates ] * Dutch (Jeroen Schot). Closes: #652230 + * Slovak (Ivan Masar). Closes: #652985 + * Russian (Yuri Kozlov). Closes: #654844 + * Hungarian (Gabor Kelemen). Closes: #655238 - -- David Kalnischkies <kalnischkies@gmail.com> Tue, 06 Dec 2011 16:35:39 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:30:36 +0100 apt (0.8.15.9) unstable; urgency=low |