Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog

diff --cc apt-pkg/init.cc
Simple merge

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc configure.ac
index ee8b7ab,de784a7..4fa54b4
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  PACKAGE="apt"
- PACKAGE_VERSION="0.9.15.1ubuntu1"
 -PACKAGE_VERSION="0.9.15.2"
++PACKAGE_VERSION="0.9.15.2ubuntu1"
  PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --cc debian/changelog
index 7196d76,22624bc..446f229
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,33 @@@
+ apt (0.9.15.2) unstable; urgency=medium
+ 
+   [ Michael Vogt ]
+   * move isatty() check into InitOutput()
+   * Use a APT::VersionSet instead of a VersionList
+     (closes: #738103)
+ 
+   [ David Kalnischkies ]
+   * simplify code to make compilers happy
+   * update libapt-pkg.symbols file
+   * bump Standards-Version to 3.9.5 (no changes needed)
+   * do not use an empty APT_CONFIG environment variable
+   * always cleanup patchfiles at the end of rred call
+   * use VersionSet in download to handle repeats (Closes: 738103)
+   * use utimes instead of utimensat/futimens (Closes: 738567)
+ 
+   [ John Ogness ]
+   * apt-cdrom should succeed if any drive succeeds (Closes: 728153)
+ 
+   [ Trần Ngọc Quân ]
+   * l10n: vi.po (621t): Update and review
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 13 Feb 2014 09:50:04 +0100
+ 
 +apt (0.9.15.1ubuntu1) trusty; urgency=low
 +
 +  * merged from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 07 Feb 2014 21:03:22 +0100
 +
  apt (0.9.15.1) unstable; urgency=medium
  
    [ David Kalnischkies ]

diff --cc debian/control
index 527a8d6,0c1341b..b9a4684
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,11 -1,10 +1,11 @@@
  Source: apt
  Section: admin
  Priority: important
 -Maintainer: APT Development Team <deity@lists.debian.org>
 -Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, 
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 +Uploaders:  Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, 
   Julian Andres Klode <jak@debian.org>
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.5
  Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
   gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
   zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,