* merged with apt--mvo

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
   * inital support for "apt-get source -t dist" (but no downgrades yet

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
   * full support for apt-get source -t now (and honor pining too)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
   * added APT::Authentication::Trust-CDROM option

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
   * fix a crash in apt-ftparchive

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
   * sparc64 alignment fix

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
   * fix segfault when there is no Archive for a VerFile

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
   * don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
   * implemented "TrustCDROM" mode

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
   * added APT::Authentication::TrustCDROM to the configure-index

diff --cc apt-pkg/deb/debmetaindex.cc
Simple merge

diff --cc configure.in
index 805056e919cd3ff66c070661db01718dff66d117,87dac8e47e7c4741a8f02815b351885513f60232..9816858a83e0cb29b1691f3a2e49754408104a66
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.6.41.0exp1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.41.0exp2")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index ba00a87e5129e39d78a78338f7286fad660cd471,078d2c8b27baff84f1f469ebcfae6a1048f4ea33..605e56eab1b9e57fabadbaf4e82cbe652a87b5e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,17 @@@
 -apt (0.6.41.1) unstable; urgency=low
++apt (0.6.41.0exp2) experimental; urgency=low
++
++  * support for apt-get source -t (and honor pining) (closes: #152129)
++  * added "APT::Authentication::Trust-CDROM" option to make the life
++    for the installer people easier (closes: #334656)
++  * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
++    (closes: #334671)
++  * apt-pkg/contrib/md5.cc:
++    - fix a alignment problem on sparc64 that gives random bus errors
++      (thanks to Fabbione for providing a test-case)
++
++ -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 16:19:49 +0200
++
 +apt (0.6.41.0exp1) experimental; urgency=low
  
    * apt-pkg/cdrom.cc:
      - unmount the cdrom when apt failed to locate any package files