diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 4 | ||||
| -rw-r--r-- | debian/changelog | 23 | ||||
| -rw-r--r-- | debian/libapt-inst1.5.symbols | 1 | ||||
| -rw-r--r-- | debian/tests/control | 2 |
4 files changed, 25 insertions, 5 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 3b3133b57..10e3c12ec 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -34,7 +34,7 @@ # APT::Archives::MinAge "2"; (old, deprecated) # APT::Periodic::MinAge "2"; (new) # - Set minimum age of a package file. If a file is younger it -# will not be deleted (0=disable). Usefull to prevent races +# will not be deleted (0=disable). Useful to prevent races # and to keep backups of the packages for emergency. # # APT::Archives::MaxSize "0"; (old, deprecated) @@ -384,7 +384,7 @@ fi now=$(date +%s) # Support old Archive for compatibility. -# Document only Periodic for all controling parameters of this script. +# Document only Periodic for all controlling parameters of this script. UpdateInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) diff --git a/debian/changelog b/debian/changelog index a3948033c..66ce3cebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,27 @@ -apt (0.9.15.3ubuntu1) trusty; urgency=low +apt (0.9.15.4ubuntu1) UNRELEASEDtrusty; urgency=low * merge with debian/sid - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Feb 2014 16:32:57 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Sun, 23 Feb 2014 00:45:20 +0100 + +apt (0.9.15.4) unstable; urgency=low + + [ Michael Vogt ] + * remove auto-generated apt-key and sources.list on clean (closes: 739749) + * add testcase for Bug#718329 + * various fixes for ADT failures + + [ Jon Severinsson ] + * add apt-vendor information for tanglu + + [ Guillem Jover ] + * ExtractTar: Allow an empty decompressor program + * DebFile: Refactor ExtractTarMember() out from ExtractArchive() + * Add support for data.tar, control.tar and control.tar.xz + * debian: Add debDebFile::ExtractTarMember to the symbols file + * Fix typos in documentation (codespell) + + -- Michael Vogt <mvo@debian.org> Sun, 23 Feb 2014 00:27:12 +0100 apt (0.9.15.3) unstable; urgency=medium diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols index 030795382..35cce919f 100644 --- a/debian/libapt-inst1.5.symbols +++ b/debian/libapt-inst1.5.symbols @@ -9,6 +9,7 @@ libapt-inst.so.1.5 libapt-inst1.5 #MINVER# (c++)"debDebFile::CheckMember(char const*)@Base" 0.8.0 (c++)"debDebFile::ControlExtract::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0 (c++)"debDebFile::ControlExtract::~ControlExtract()@Base" 0.8.0 + (c++)"debDebFile::ExtractTarMember(pkgDirStream&, char const*)@Base" 0.9.15.4 (c++)"debDebFile::ExtractArchive(pkgDirStream&)@Base" 0.8.0 (c++)"debDebFile::MemControlExtract::TakeControl(void const*, unsigned long)@Base" 0.8.0 (c++)"debDebFile::MemControlExtract::Read(debDebFile&)@Base" 0.8.0 diff --git a/debian/tests/control b/debian/tests/control index ae794f762..12490a36f 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests Restrictions: allow-stderr -Depends: @, apt, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4 +Depends: @, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev |