diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-12 21:39:44 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-12 21:46:09 +0100 |
| commit | 81dca2d03ad4095c7aaa8b5f74885bc0e61b3ee3 (patch) | |
| tree | dce43f02c0f8d61c413d98f559f4f3ef90d60876 /debian/changelog | |
| parent | 49fc36e1acda8453df079cad8d04b70d9ad4fcfa (diff) | |
| parent | 5669725a6163d3e1184c3991f993085e42734c33 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
doc/apt-verbatim.ent
doc/po/apt-doc.pot
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/mr.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/tr.po
po/uk.po
po/vi.po
po/zh_CN.po
po/zh_TW.po
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6d77f0fcd..230d5055d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +apt (0.9.14.1ubuntu1) trusty; urgency=low + + * Merge from debian/sid + * disable autopkgtest for now until it can test the installed + packages and not only the build-tree (thanks to Martin Pitt) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 12 Dec 2013 21:19:49 +0100 + +apt (0.9.14.1) unstable; urgency=medium + + * fix apt-get source -t dist regression (closes: #731853) + and add testcase + * clarify error message when apt-get source=ver fails + (thans to David Kalnischkies) + * Fix conffile prompt regression (LP: #1260297) + and add testcase + * improve error message for apt-get source pkg:arch{=ver,/release} + + -- Michael Vogt <mvo@debian.org> Thu, 12 Dec 2013 18:34:29 +0100 + apt (0.9.14ubuntu1) trusty; urgency=low * Merged from debian/sid |