Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog
	doc/apt-verbatim.ent
	doc/po/apt-doc.pot
	doc/po/de.po
	doc/po/es.po
	doc/po/fr.po
	doc/po/it.po
	doc/po/ja.po
	doc/po/pl.po
	doc/po/pt.po
	doc/po/pt_BR.po
	po/apt-all.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

1 files changed, 184 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index ed8f68e43..b48a50f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,37 +1,163 @@
-apt (1.0.4ubuntu4) utopic; urgency=medium
+apt (1.0.8ubuntu1) UNRELEASED; urgency=low
 
-  * test/integration/test-essential-force-loopbreak: 
-    - fix test on non-amd64 systems
+  * merged fixes from debian/sid
 
- -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 10:56:09 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 10 Sep 2014 08:12:38 +0200
 
-apt (1.0.4ubuntu3) utopic; urgency=medium
+apt (1.0.8) unstable; urgency=medium
 
-  * ensure that test-apt-ftparchive-cachedb-lp1274466, 
-    test-external-dependency-solver-protocol run in the ADT
-    environment
+  [ Holger Wansing ]
+  * German program translation update (Closes: 758837)
 
- -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 08:47:29 +0200
+  [ Américo Monteiro ]
+  * Portuguese manpages translation update (Closes: 759608)
 
-apt (1.0.4ubuntu2) utopic; urgency=medium
+  [ Warren He ]
+  * initialize iPolicyBrokenCount in DepCache::Update (Closes: 758397)
 
-  * debian/test/control:
-    - add missing db-util to test dependencies
-  * debian/tests/run-tests:
-    - fix path for apt-internal-solver
+  [ Andreas Oberritter ]
+  * Avoid yielding blank lines with APT::Cmd::use-format=true
 
- -- Michael Vogt <mvo@ubuntu.com>  Wed, 11 Jun 2014 14:51:31 +0200
+  [ Michael Vogt ]
+  * Make Proxy-Auto-Detect check for each host (Closes: #759264)
+  * Add testcase for apt list --all-versions
+  * * apt-pkg/deb/dpkgpm.cc:
+    - update string matching for dpkg I/O errors. (LP: #1363257)
+    - properly parse the dpkg status line so that package name 
+      is properly set and an apport report is created. Thanks 
+      to Anders Kaseorg for the patch  (LP: #1353171)
+  * Use heap to allocate PatternMatch to avoid potential stack overflow
+    (Closes: 759612)
+  * Run autopkgtest tests with "env -i" to avoid pollution from the host env
+    (Closes: #759655)
+  * test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: 
+    - use downloadfile() to fix test failure
+  * Fix incorrect upgradable listing in "apt list" 
+    (thanks to Michael Musenbrock) (Closes: #753297)
+  * apt-pkg/cachefile.cc:
+    - ensure we have a Policy in CacheFile.BuildDepCache()
+  * methods/http.cc:
+    - Improve Debug::Acquire::http debug output
 
-apt (1.0.4ubuntu1) utopic; urgency=low
+  [ Dimitri John Ledkov ]
+  * apt-ftparchive: make Packages & Sources generation optional, 
+    during Generate call
 
-  * Merged from debian/sid, remaining changes:
-    - patch for apt cross-building, see http://bugs.debian.org/666772
-    - ubuntu changelog download handling
-    - apt-key net-update/apt-xapian-index
-    - git-buildpackage config adjustments
-    - ubuntu keyring
+  [ David Kalnischkies ]
+  * support regular expressions in 'apt search'
+  * implement --full in apt search
+  * fix progress report for upgrade and reinstall
+  * rework PTY magic to fix stair-stepping on kfreebsd (Closes: 759684)
+  * don't call pager in non-terminals for changelog (Closes: 755040)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jun 2014 19:00:00 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 09 Sep 2014 20:09:11 +0200
+
+apt (1.0.7) unstable; urgency=medium
+
+  [ Michael Vogt ]
+  * add REAMDE.md
+  * StringToBool: only act if the entire string is consumed by strtol()
+  * Use @builddeps@ in the debian/tests/control file
+  * apt-pkg/acquire-item.cc: make pkgAcqDiffIndex more uniform
+  * Fix SmartConfigure to ignore ordering of packages that are already valid
+  * doc/apt.8.xml: fix typo, thanks to Jakub Wilk (Closes: #756056)
+  * doc/po/pt.po: updated, thanks to Américo Monteir (Closes: #756200)
+
+  [ victory ]
+  * Update Japanese documentation translation (Closes: #754817)
+
+  [ Trần Ngọc Quân ]
+  * l10n: vi.po (636t): Update one new string
+
+  [ Julian Andres Klode ]
+  * Fix debListParser to accept "no" as a value for the Multi-Arch field
+    (Closes: #759099)
+
+  [ Mert Dirik ]
+  * Turkish program translation update (Closes: 756710)
+
+  [ Miroslav Kure ]
+  * Czech program translation update (Closes: 758208)
+
+  [ David Kalnischkies ]
+  * add dpkg::source-options for dpkg-source invocation (Closes: 757534)
+  * support versioned provides as implemented by dpkg (Closes: 758153)
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 27 Aug 2014 17:11:42 -0700
+
+apt (1.0.6) unstable; urgency=medium
+
+  [ Chris Leick ]
+  * German translation reviewed by Erik Pfannenstein
+
+  [ Michael Vogt ]
+  * methods/http.cc: use Req.str() in debug output
+  * Do not try to parse invalid translation files (LP: #756317)
+  * Do not clean "/" in pkgAcquire::Clean/pkgArchiveCleaner (Closes: #753531)
+  * Only show packages as upgradable if the have a CandidateVer != 0
+    (Closes: #753297)
+
+  [ Trần Ngọc Quân ]
+  * l10n: vi.po: Update 3 new messages
+
+  [ Joe Hansen ]
+  * Danish program translation update (Closes: 753979)
+
+  [ David Kalnischkies ]
+  * handle moved mmap after UniqFindTagWrite call (Closes: #753941)
+
+  [ Michele Orrù ]
+  * use printf instead of echo in testing framework
+
+  [ Cédric Barboiron ]
+  * Improve description how to turn off the caches (Closes: #753531)
+
+  [ Guillem Jover ]
+  * po: Fill or add missing Language field
+  * po: Remove fuzzy from file msgid header
+  * po: Fill Project-Id-Version with correct project id and version
+  * po: Fix Plural-Forms fields
+  * po: Fix or add missing email addresses
+  * po: Fix encoding issues
+  * po: Fix format specifier order in translation
+  * build: Set the XSL parameter through the command line instead of sed
+  * build: Convert from DebianDoc SGML to DocBook XML
+  * doc: Convert from DebianDoc SGML to DocBook XML
+  * doc: Unfuzzy DocBook translations
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 10 Jul 2014 11:46:07 +0200
+
+apt (1.0.5) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * fix autopkgtest tests
+  * fix test-apt-ftparchive-cachedb-lp1274466 and apt-internal-solver tests
+  * test/integration/test-essential-force-loopbreak: fix on non-amd64 systems
+  * Tell the user if no updates are available after apt update (Closes: #751388)
+
+  [ Michele Orrù ]
+  * Check for gtest's header before building.
+
+  [ Chris Leick ]
+  * Updated translation of german documentation
+
+  [ Konstantin Manna ]
+  * fix two german manpage spelling mistakes (Closes: 751635)
+  * add missing comma in SEE ALSO of apt-secure manpage (Closes: 748506)
+
+  [ Fredrik Fornwall ]
+  * use P_ instead of ngettext to compiling with --disable-nls (Closes: 751857)
+
+  [ David Kalnischkies ]
+  * don't send pkg from an unknown architecture via EDSP
+  * fix SubstVar to be usable as a replace_all method
+  * show our broken packages message in 'apt' solver
+  * do not call resolver twice on (dist-)upgrade
+
+  [ Stefano Zacchiroli ]
+  * EDSP doc: clarify that Install/Remove packages are arch-qualified
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 18 Jun 2014 13:35:13 +0200
 
 apt (1.0.4) unstable; urgency=low
 
@@ -74,6 +200,41 @@ apt (1.0.4) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Tue, 10 Jun 2014 14:55:05 +0200
 
+apt (1.0.4ubuntu4) utopic; urgency=medium
+
+  * test/integration/test-essential-force-loopbreak: 
+    - fix test on non-amd64 systems
+
+ -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 10:56:09 +0200
+
+apt (1.0.4ubuntu3) utopic; urgency=medium
+
+  * ensure that test-apt-ftparchive-cachedb-lp1274466, 
+    test-external-dependency-solver-protocol run in the ADT
+    environment
+
+ -- Michael Vogt <mvo@ubuntu.com>  Thu, 12 Jun 2014 08:47:29 +0200
+
+apt (1.0.4ubuntu2) utopic; urgency=medium
+
+  * debian/test/control:
+    - add missing db-util to test dependencies
+  * debian/tests/run-tests:
+    - fix path for apt-internal-solver
+
+ -- Michael Vogt <mvo@ubuntu.com>  Wed, 11 Jun 2014 14:51:31 +0200
+
+apt (1.0.4ubuntu1) utopic; urgency=low
+
+  * Merged from debian/sid, remaining changes:
+    - patch for apt cross-building, see http://bugs.debian.org/666772
+    - ubuntu changelog download handling
+    - apt-key net-update/apt-xapian-index
+    - git-buildpackage config adjustments
+    - ubuntu keyring
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jun 2014 19:00:00 +0200
+
 apt (1.0.3) unstable; urgency=medium
 
   [ Michael Vogt ]