* cmdline/apt-get.cc:

  - fix apt-get source pkg=version regression (closes: #561971)
* apt-pkg/contrib/cdromutl.cc:
  - fix UnmountCdrom() fails, give it a bit more time and try
    the umount again
* 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

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 9615201b238d3c0b5c941857714026e8f31a8b44,7e38cda9985964fddf1c77399ff743fdcde92009..13fd4471db0abb6fbe06174924c42f682add3bc2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,20 +1,32 @@@
 -apt (0.7.25.1) UNRELEASED; urgency=low
++apt (0.7.25ubuntu3) UNRELEASED; urgency=low
+ 
 -  * merged lp:~mvo/apt/history
 -    - this writes a /var/log/apt/history tagfile that contains details
 -      from the transaction (complements term.log)
+   * cmdline/apt-get.cc:
+     - fix apt-get source pkg=version regression (closes: #561971)
+   * apt-pkg/contrib/cdromutl.cc:
+     - fix UnmountCdrom() fails, give it a bit more time and try
+       the umount again
+   * 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
+ 
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +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
  
    [ Christian Perrier ]

diff --cc doc/examples/configure-index
Simple merge