merged from lp:~mvo/apt/mvo

diff --cc debian/apt.dirs
index 1377c8066edcb448388f6ac99ded7044c54f1012,fb6716c35bc89bd3bb9a8db813c79b7dba9888f7..d11ee0f2f67953a6517e443e8659e003bf321abc
--- 1/debian/apt.dirs
--- 2/debian/apt.dirs
+++ b/debian/apt.dirs
@@@ -8,9 -8,7 +8,8 @@@ etc/apt/sources.list.
  etc/logrotate.d
  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 --cc debian/changelog
index 21c71e4d6db4b5e79239e6b4edc609c0948b55aa,a150197b1358aad4b2b56cd6c479412919a9dabf..4647c0e249ce58f25468a51a3c28492e09e77ca6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -10,24 -15,10 +12,25 @@@ apt (0.7.25ubuntu3) UNRELEASED; urgency
      - 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>  Fri, 18 Dec 2009 16:54:18 +0100
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jan 2010 12:12:16 +0100
 +
 +apt (0.7.25ubuntu2) lucid; urgency=low
 +
 +  * Change history branch so that it does not break the 
 +    apt ABI for the pkgPackageManager interface
 +    (can be reverted on the next ABI break)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Dec 2009 10:14:16 +0100
 +
 +apt (0.7.25ubuntu1) lucid; urgency=low
 +
 +  * Merged from the mvo branch
 +  * merged from the lp:~mvo/apt/history branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Dec 2009 09:44:08 +0100
  
  apt (0.7.25) unstable; urgency=low