merge non-git uploaded changelogs and verify that the code is in git too

1 files changed, 70 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index b48a50f30..243ab0ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -159,46 +159,41 @@ apt (1.0.5) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Wed, 18 Jun 2014 13:35:13 +0200
 
-apt (1.0.4) unstable; urgency=low
+apt (1.0.4ubuntu8) utopic; urgency=medium
 
-  [ Michael Vogt ]
-  * Implement CacheDB for source packages in apt-ftparchive
-  * apt-private/acqprogress.cc: reset color in apt update
-  * Show progress in run-tests
-  * Never parse Version/Architecture tags in a Translation-$lang file
-  * Show upgradable packages after apt update (Closes: 748389)
-  * Fix various errors found by clang -fsanitize=address
-  * Fix various errors foudn by clang scan-build
-  * Show unauthenticated warning for source packages as well (Closes: #749795)
-  * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466)
-  * cmdline/apt-helper.cc: use less generic description/short-description 
-    in apt-helper download
-  * add pkgSrcRecords::Step() to step through all the pkgSrcRecords
-    (thanks to Helmut Grohne)
+  * 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)
 
-  [ David Kalnischkies ]
-  * initialize Verify in second pkgAcqIndex constructor
-  * consistently fail if Smart* packagemanager actions fail
-  * fix tight loop detection and temporary removes
-  * if Resolver fails, do not continue even if not broken
-  * check exit status of external solvers
-  * do not revert candidate for protected packages (Closes: 745046)
-  * support Acquire::GzipIndexes in dumpavail (Closes: 742835)
+ -- Brian Murray <brian@ubuntu.com>  Fri, 29 Aug 2014 15:15:17 -0700
 
-  [ Stefano Zacchiroli ]
-  * EDSP doc: fix typo in Request stanza description
-  * EDSP: bump protocol version to 0.5
-  * EDSP: add Architecture(s) multi-arch fields to the Request stanza
-  * EDSP: add Source field to Package stanzas
-  * EDSP: add APT-Release field to Package stanzas
+apt (1.0.4ubuntu7) utopic; urgency=medium
 
-  [ Sebastian Schmidt ]
-  * fix screen width detection for apt/apt-get lists (Closes: 748430, 747942)
+  * debian/tests/run-tests: tests don't get along with proxy, so unset proxy
+    variables. See Debian #759655
 
-  [ Milo Casagrande ]
-  * Italian program translation update (Closes: 750009)
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 29 Aug 2014 09:13:37 +0200
 
- -- Michael Vogt <mvo@debian.org>  Tue, 10 Jun 2014 14:55:05 +0200
+apt (1.0.4ubuntu6) utopic; urgency=low
+
+  * apt-pkg/packagemanager.cc:
+    - fix incorrect configure ordering in the SmartConfigure step
+      by skiping packages that do not need immediate action
+      (LP: #1347721)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Jul 2014 11:46:18 +0200
+
+apt (1.0.4ubuntu5) utopic; urgency=medium
+
+  [ Michael Vogt ]
+  * Try not to parse invalid translation files (LP: #756317)
+
+  [ Iain Lane ]
+  * Remove stray *.debhelper files.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Fri, 04 Jul 2014 10:15:28 +0100
 
 apt (1.0.4ubuntu4) utopic; urgency=medium
 
@@ -235,6 +230,47 @@ apt (1.0.4ubuntu1) utopic; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jun 2014 19:00:00 +0200
 
+apt (1.0.4) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * Implement CacheDB for source packages in apt-ftparchive
+  * apt-private/acqprogress.cc: reset color in apt update
+  * Show progress in run-tests
+  * Never parse Version/Architecture tags in a Translation-$lang file
+  * Show upgradable packages after apt update (Closes: 748389)
+  * Fix various errors found by clang -fsanitize=address
+  * Fix various errors foudn by clang scan-build
+  * Show unauthenticated warning for source packages as well (Closes: #749795)
+  * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466)
+  * cmdline/apt-helper.cc: use less generic description/short-description 
+    in apt-helper download
+  * add pkgSrcRecords::Step() to step through all the pkgSrcRecords
+    (thanks to Helmut Grohne)
+
+  [ David Kalnischkies ]
+  * initialize Verify in second pkgAcqIndex constructor
+  * consistently fail if Smart* packagemanager actions fail
+  * fix tight loop detection and temporary removes
+  * if Resolver fails, do not continue even if not broken
+  * check exit status of external solvers
+  * do not revert candidate for protected packages (Closes: 745046)
+  * support Acquire::GzipIndexes in dumpavail (Closes: 742835)
+
+  [ Stefano Zacchiroli ]
+  * EDSP doc: fix typo in Request stanza description
+  * EDSP: bump protocol version to 0.5
+  * EDSP: add Architecture(s) multi-arch fields to the Request stanza
+  * EDSP: add Source field to Package stanzas
+  * EDSP: add APT-Release field to Package stanzas
+
+  [ Sebastian Schmidt ]
+  * fix screen width detection for apt/apt-get lists (Closes: 748430, 747942)
+
+  [ Milo Casagrande ]
+  * Italian program translation update (Closes: 750009)
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 10 Jun 2014 14:55:05 +0200
+
 apt (1.0.3) unstable; urgency=medium
 
   [ Michael Vogt ]