merged from lp:~mvo/apt/mvo

diff --git a/debian/apt.dirs b/debian/apt.dirs
index 1377c8066edcb448388f6ac99ded7044c54f1012..d11ee0f2f67953a6517e443e8659e003bf321abc 100644 (file)
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -10,7 +10,6 @@ var/cache/apt/archives/partial
 var/lib/apt/lists/partial
 var/lib/apt/mirrors/partial
 var/lib/apt/periodic
-var/lib/apt/media
 var/log/apt
 usr/share/bug/apt
 usr/share/lintian/overrides

diff --git a/debian/changelog b/debian/changelog
index 21c71e4d6db4b5e79239e6b4edc609c0948b55aa..4647c0e249ce58f25468a51a3c28492e09e77ca6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,14 +5,17 @@ apt (0.7.25ubuntu3) UNRELEASED; urgency=low
   * apt-pkg/contrib/cdromutl.cc:
     - fix UnmountCdrom() fails, give it a bit more time and try
       the umount again
+  * apt-pkg/cdrom.cc:
+    - fix crash in pkgUdevCdromDevices
   * methods/cdrom.cc:
     - fixes in multi cdrom setup code
     - add new "Acquire::cdrom::AutoDetect" variable that enables/disables
       the dlopen of libudev for automatic cdrom detection
   * cmdline/apt-cdrom.cc:
-    - add new --auto-detect option
+    - add new --auto-detect option that uses libudev to figure out
+      the cdrom/mount-point
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jan 2010 12:01:36 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jan 2010 12:12:16 +0100
 
 apt (0.7.25ubuntu2) lucid; urgency=low