From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 10 Sep 2010 10:29:10 +0000 (+0200)
Subject: merged from lp:~mvo/apt/mvo
X-Git-Tag: 0.9.13.exp1ubuntu1~261
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d674bb1d1a8e561ccedab9145dd58d34df68a66e

merged from lp:~mvo/apt/mvo
---

d674bb1d1a8e561ccedab9145dd58d34df68a66e
diff --cc debian/changelog
index 64f606f77,f1976f516..64d37ba96
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,18 +1,69 @@@
- apt (0.8.3ubuntu2) maverick; urgency=low
 -apt (0.8.2) unstable; urgency=low
++apt (0.8.3ubuntu2) UNRELEASEDmaverick; urgency=low
  
 -  * 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
 +  * ftparchive/writer.cc:
 +    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
 +      available LP: #633967. Thanks to Colin Watson
+   * apt-pkg/contrib/cdromutl.cc:
+     - if apt-cdrom is used on writable media (like usb-sticks), do
+       not use the root directory to identify the medium (as all 
+       changes there change the ident id). Use the .disk directory 
+       instead 
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 20:21:43 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
 +
 +apt (0.8.3ubuntu1) 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)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2010 09:27:24 +0200
 +
 +apt (0.8.3) unstable; urgency=low
 +
 +  [ Manpages translations ]
 +  * Japanese (KURASAWA Nozomu). Closes: #595862
 +
 +  [ Michael Vogt ]
 +  * 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
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/apt-ftparchive.cc:
 +    - ensure that BinDirectory as well as Tree settings get
 +      the correct default FileMode setting (Closes: #595922)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +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