* merged with apt--mvo

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-116
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-117
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-118
   Russian translation update by Yuri Kozlov

 * bubulle@debian.org--2005/apt--main--0--patch-119
   Merge with Michael and add update-po as a pre-req for binary

 * bubulle@debian.org--2005/apt--main--0--patch-120
   Re-generate all PO Files

 * bubulle@debian.org--2005/apt--main--0--patch-121
   Complete French translation

 * bubulle@debian.org--2005/apt--main--0--patch-122
   Correct typography in French translation

 * bubulle@debian.org--2005/apt--main--0--patch-123
   Spelling fix for consistency in French translation

 * bubulle@debian.org--2005/apt--main--0--patch-124
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-125
   Fixed localization of y/n questions in German translation

 * bubulle@debian.org--2005/apt--main--0--patch-126
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-127
   Complete Tagalog translation / Add Changelog

 * bubulle@debian.org--2005/apt--main--0--patch-128
   Danish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-129
   Basque translation update

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83
   * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84
   * added armeb to archtable

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85
   * merged with bubulle, changelog updates

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86
   * merged the NMU from Franz Pop, fixed armeb problem (#333599)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87
   * removed double armeb entry in buildlib/sizetable

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
   * finalized changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
   * turn off "secure-acquire" when --allow-unauthenticated is given

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc configure.in
index 5ac3b0d8a194a58465fbfaf3105682cba4953b33,6130ab544bca7d0729b927d141cc9ccb3bc9d718..af423be05f27786d536db65647d15defea043060
--- 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.42.1exp1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3exp1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index 67195fc7e2ae5bcd6bebb4f0b0784ed1f38b388c,9e9b46ab9c36a9ebd16290465bea3f857f0695b8..d9ceff5eaf9f6630d1a3c3863f9ea9c9d4a1c993
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,32 +1,45 @@@
- apt (0.6.42.1exp1) experimental; urgency=low
++apt (0.6.42.3exp1) experimental; urgency=low
 +
 +  * added support for package index diffs 
 +  * added support for i18n of the package descriptions
 +  * synced with the apt--debian-sid--0 branch
 +  * build from mvo@debian.org--2005/apt--debian-experimental--0
 +    (from http://people.debian.org/~mvo/arch)
 +  * fix bug in apt-cache when displaying the record (closes: #334887)
 +  * add patch to fix http download corruption problem (thanks to
 +    Petr Vandrovec, closes: #280844, #290694)
 +  
-  -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:12:13 +0200
++ -- Michael Vogt <mvo@debian.org>  Sun, 13 Nov 2005 13:33:57 +0100
 +
+ apt (0.6.42.3) unstable; urgency=low
+ 
+   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
+     - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
+     - patch-119: add update-po as a pre-req for binary (closes: #329910)
+     - patch-121: Complete French translation
+     - patch-125: Fixed localization of y/n questions in German translation 
+                  (closes: #337078)
+     - patch-126: Swedish translation update (closes: #337163)
+     - patch-127: Complete Tagalog translation (closes: #337306)
+     - patch-128: Danish translation update (closes: #337949)
+     - patch-129: Basque translation update (closes: #338101)
+   * cmdline/apt-get.cc:
+     - bufix in FindSrc  (closes: #335213, #337910)
+   * added armeb to archtable (closes: #333599)
+   * with --allow-unauthenticated use the old fallback behaviour for
+     sources (closes: #335112)
+    
+  -- Michael Vogt <mvo@debian.org>  Wed,  9 Nov 2005 07:22:31 +0100
+ 
+ apt (0.6.42.2) unstable; urgency=high
+ 
+   * NMU (approved by maintainer)
+   * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500).
+   * Add big-endian arm (armeb) support (closes: #333599).
+   * Priority high to get the AMD key into testing ASAP.
+ 
+  -- Frans Pop <fjp@debian.org>  Sun, 30 Oct 2005 21:29:11 +0100
+  
  apt (0.6.42.1) unstable; urgency=low
  
    * fix a incorrect example in the apt_prefrences man page