Merge branch 'debian/sid' into debian/experimental

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3be808686742bcb7a8d55fcee8982acb1a9822c5..af75ee75767aa3ee49d8530e69ee9c06c93b830b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+<<<<<<< HEAD
+apt (0.9.10~exp1) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
+    - fix invalid InRelease file download checking and add regression
+      test to server broken files to the buildin test webserver
+  * stop exporting the accidently exported parsenetrc() symbol
+  * apt-pkg/deb/dpkgpm.cc:
+    - use tcgetattr() on STDOUT instead of STDIN so that term.log
+      works for redirected stdin
+    - print error in log if tcgetattr() fails instead of writing
+      a empty file
+  * use sha512 when available (LP: #1098752)
+  * [ABI-Break] lp:~mvo/apt/source-hashes:
+    - use sha{512,256,1} for deb-src when available LP: #1098738
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 12:12:39 +0100
+=======

 apt (0.9.11) UNRELEASED; urgency=low
 
   The "Happy 20th Birthday Debian" upload
 apt (0.9.11) UNRELEASED; urgency=low
 
   The "Happy 20th Birthday Debian" upload


@@ -29,6 +48,7 @@ apt (0.9.11) UNRELEASED; urgency=low
   * French translation update.
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Aug 2013 09:27:35 +0200
   * French translation update.
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Aug 2013 09:27:35 +0200

+>>>>>>> debian/sid

 
 apt (0.9.10) unstable; urgency=low
 
 
 apt (0.9.10) unstable; urgency=low
 


@@ -379,12 +399,21 @@ apt (0.9.7.8) unstable; urgency=criticial
   * SECURITY UPDATE: InRelease verification bypass
     - CVE-2013-1051
   
   * SECURITY UPDATE: InRelease verification bypass
     - CVE-2013-1051
   

+  [ Programs translation updates ]
+  * Japanese (Kenshi Muto). Closes: #699783
+  

   [ David Kalnischk ]
   * apt-pkg/deb/debmetaindex.cc,
     test/integration/test-bug-595691-empty-and-broken-archive-files,
   [ David Kalnischk ]
   * apt-pkg/deb/debmetaindex.cc,
     test/integration/test-bug-595691-empty-and-broken-archive-files,

+  * [ABI BREAK] apt-pkg/pkgcache.h:
+    - adjust pkgCache::State::VerPriority enum, to match reality

     test/integration/test-releasefile-verification:
     - disable InRelease downloading until the verification issue is
       fixed, thanks to Ansgar Burchardt for finding the flaw
     test/integration/test-releasefile-verification:
     - disable InRelease downloading until the verification issue is
       fixed, thanks to Ansgar Burchardt for finding the flaw

+    - quote plus in filenames to work around a bug in the S3 server
+      (LP: #1003633)
+  * apt-pkg/indexrecords.cc:
+    - support '\r' in the Release file

 
  -- Michael Vogt <mvo@debian.org>  Thu, 14 Mar 2013 07:47:36 +0100
 
 
  -- Michael Vogt <mvo@debian.org>  Thu, 14 Mar 2013 07:47:36 +0100