* backported a fix from apt-cdrom so that it umounts it's cdrom again in case of...

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55
   * fix apt-pkg/cdrom.cc to umount the cdrom again if anything fails

diff --cc apt-pkg/cdrom.cc
Simple merge

diff --cc debian/changelog
index 06a35766116221354a272a8ac7b8d3fb25c332b8,e88689667993fb591ea76c22c7517c1ffcf4506c..c1a625b97ac4752d10de691ea7ea803b3124840a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,11 +1,30 @@@
 -apt (0.6.41.1) unstable; urgency=low
 +apt (0.6.40.1ubuntu5) breezy; urgency=low
  
 -  * apt-pkg/cdrom.cc:
 +  * Cheery picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
 +    This adds media-change reporting to the apt status-fd (ubuntu #15213)
++  * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
++    apt-pkg/cdrom.cc:
+     - unmount the cdrom when apt failed to locate any package files
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 13:45:53 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 15:44:26 +0200
  
 -apt (0.6.41) unstable; urgency=low
 +apt (0.6.40.1ubuntu4) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - fix a embarrassing typo
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Sep 2005 10:10:37 +0200
 +
 +apt (0.6.40.1ubuntu3) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - use the ctime as well when figuring what packages need to
 +      be removed. This fixes the problem that packages copied with    
 +      "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Sep 2005 18:30:46 +0200
 +
 +apt (0.6.40.1ubuntu2) breezy; urgency=low
  
    * improved the support for "error" and "conffile" reporting from
      dpkg, added the format to README.progress-reporting