* apt-pkg/indexcopy.cc:

  - only use trusted.gpg.d directory if it exists
  - do not replace /dev/null when running in APT::CDROM::NoAct
    mode (LP: #612666), thanks to Colin Watson

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

diff --cc debian/changelog
index 2791a4e6738015ca71eb9b53c62b53b520aedc2b,3cdeb593f4d5ab6f421dcb5d044e5acd5bee66bc..1c24a6b29ef8494f1830341c29b7753285b5f867
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,13 +1,42 @@@
 -apt (0.8.2) unstable; urgency=low
 +apt (0.8.2ubuntu1) maverick; urgency=low
  
 +  * merged fixes from debian-sid
 +  * debian/rules:
 +    - put ubuntu-archive.gpg back into the package (LP: #620576)
 +  * apt-pkg/init.cc:
 +    - ignore ".distUpgrade" and ".save" files in sources.list.d
 +      (LP: #631770)
+   * apt-pkg/indexcopy.cc:
+     - only use trusted.gpg.d directory if it exists
+     - do not replace /dev/null when running in APT::CDROM::NoAct
+       mode (LP: #612666), thanks to Colin Watson
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 20:21:43 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2010 09:27:24 +0200
 +
 +apt (0.8.2) unstable; urgency=low
 +
 +  [ Manpages translations ]
 +  * Spanish (Omar Campagne). Closes: #595557
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/versionmatch.cc:
 +    - do not accept 'Pin: origin "' (missing closing ") as a valid
 +      way to pin a local archive: either "" or none…
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - create Dir::Log if needed to support /var/log as tmpfs or similar,
 +      inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
 +  * apt-pkg/indexcopy.cc:
 +    - support really still the APT::GPGV::TrustedKeyring setting,
 +      as it breaks d-i badly otherwise (Closes: #595428)
 +  * cmdline/apt-key:
 +    - support also Dir::Etc::Trusted so that apt-key works in the same
 +      way as the library part which works with the trusted files
 +  * methods/{gzip,bzip2}.cc:
 +    - empty files can never be valid archives (Closes: #595691)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 06 Sep 2010 18:10:06 +0200
  
 -apt (0.8.1) UNRELEASED; urgency=low
 +apt (0.8.1) unstable; urgency=low
  
    [ Programs translations ]
    * Thai (Theppitak Karoonboonyanan). Closes: #592695