* Merge with mvo

1 files changed, 14 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 45785487..a7241740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,20 @@ python-apt (0.7.9~exp3) experimental; urgency=low
     - fix incorrect indent
   * debian/control:
     - add Recommends to iso-codes (for iso_3166.xml)
+  * apt/package.py:
+    - make sure to set the defaulttimeout back to the
+      original value (in getChangelog(), LP: #314212)
+  * apt/cache.py:
+    - when setting a alternative rootdir, read the
+      config from it as well
+  * python/configuration.cc, python/apt_pkgmodule.cc:
+    - add apt_pkg.ReadConfigDir()
+  * python/cache.cc, tests/getcache_mem_corruption.py:
+    - test if progress objects have the right methods
+      and raise error if not (thanks to Emanuele Rocca)
+      closes: #497049
+  * apt/package.py:
+    - avoid uneeded interal references in the Package objects
 
  --