merge Julians changes from lp:~mvo/apt/debian-sid

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 68ee83bac8c23642f9142ebe0c796d004c82dce3..313ae28650ca4206fdb9f32701d555a663948e75 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,11 +11,17 @@ apt (0.7.25) UNRELEASED; urgency=low
     Closes: #479997
   * Polish translation update by Wiktor Wandachowicz
     Closes: #548571
     Closes: #479997
   * Polish translation update by Wiktor Wandachowicz
     Closes: #548571

-  
-  [ Michael Vogt ]
+
+  [ David Kalnischkies ]

   * apt-pkg/packagemanager.cc:
   * apt-pkg/packagemanager.cc:

-    - fix overly aggressive immediate config propergation
-      (thanks to David Kalnischkies)
+    - better debug output for ImmediateAdd with depth and why
+    - improve the message shown for failing immediate configuration
+  * doc/guide.it.sgml: moved to doc/it/guide.it.sgml
+  * doc/po4a.conf: activate translation of guide.sgml and offline.sgml
+  * doc/apt.conf.5.xml:
+    - provide a few more details about APT::Immediate-Configure
+  * doc/sources.list.5.xml:
+    - add note about additional apt-transport-methods

 
   [ Julian Andres Klode ]
   * doc/apt.conf.5.xml:
 
   [ Julian Andres Klode ]
   * doc/apt.conf.5.xml: