diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-07-05 12:06:45 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-07-05 12:06:45 +0200 |
| commit | 7ea4af9da25a802516461434b12a61e21743f960 (patch) | |
| tree | 9277fece2f8bd004ffa8f5ca558423de98afa8d8 /debian | |
| parent | 9643d533f38fa35b345755201eebfd227aa5adbb (diff) | |
| parent | fd3b761e8cba6ed626639b50b1221246098c7b3a (diff) | |
merge with debian-experimental-ma
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 51c75dad0..878d5238a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low + [ David Kalnischkies ] * cmdline/cacheset.cc: - doesn't include it in the library for now as it is too volatile - get the candidate either from an already built depcache @@ -37,7 +38,21 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - add another round of const& madness as the previous round accidentally NOT overrides the virtual GetCandidateVer() method (Closes: #587725) - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 28 Jun 2010 22:12:24 +0200 + [ Julian Andres Klode ] + * methods/ftp.h: + - Handle different logins on the same server (Closes: #586904). + * apt-pkg/deb/deblistparser.cc: + - Handle architecture wildcards (Closes: #547724). + * apt-pkg/versionmatch.cc: + - Support matching pins by regular expressions or glob() like patterns, + regular expressions have to be put between to slashes; for example, + /.*/. + * apt-pkg/contrib/fileutl.cc: + - Make FileFd replace files atomically in WriteTemp mode (for cache, etc). + * debian/control: + - Set Standards-Version to 3.9.0 + + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 05 Jul 2010 12:05:30 +0200 apt (0.7.26~exp7) experimental; urgency=low diff --git a/debian/control b/debian/control index 4f41c130b..d482f2d0b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org> -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 |