merge with debian-experimental-ma

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0f3d0d499e2b6a1ef8a85ab8eccc1008c54ba930..1207fb52fad270097d5cee9fc112a2e4e6fb8867 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low
+apt (0.8.0~pre1) UNRELASED; urgency=low
+
+  [ Programs translations ]
+  * Swedish translation update. Closes: #592366
 
   [ Michael Vogt ]
+  * merge of the debian-expermental-ma branch
+  * refresh po/pot files in doc/ and po/
   * apt-pkg/pkgcache.cc:
     - re-evaluate the architectures cache when the cache is (re)opened
 
@@ -12,13 +17,20 @@ apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low
   * apt-pkg/contrib/fileutl.cc:
     - Add WriteAtomic mode.
     - Revert WriteEmpty to old behavior (LP: #613211)
+  * apt-pkg, methods:
+    - Convert users of WriteEmpty to WriteAtomic.
   * apt-pkg/depcache.cc:
     - Only try upgrade for Breaks if there is a newer version, otherwise
       handle it as Conflicts (by removing it) (helps for #591882).
   * debian/control:
     - Add dependency on gnupg to apt, apt-key uses it.
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 17:37:14 +0200
+  [ David Kalnischkies ]
+  * apt-pkg/algorithms.cc:
+    - change the debug outputs to display also arch of the
+      package and version dependencies information
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 10 Aug 2010 15:56:11 +0200
 
 apt (0.7.26~exp12) experimental; urgency=low
 
@@ -364,6 +376,7 @@ apt (0.7.26~exp5) experimental; urgency=low
   [ Christian Perrier ]
   * Slovak translation update. Closes: #581159
   * Italian translation update. Closes: #581742
+  * Swedish translation update. Closes: #592366
 
  -- Michael Vogt <mvo@debian.org>  Tue, 25 May 2010 16:01:42 +0200