* merged with apt--mvo

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-105
   Proofread by Fred Bothamy

 * bubulle@debian.org--2005/apt--main--0--patch-106
   Merge with mvo

 * bubulle@debian.org--2005/apt--main--0--patch-107
   Italian translation corrected

 * bubulle@debian.org--2005/apt--main--0--patch-108
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-109
   Italian translation completed

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

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

 * bubulle@debian.org--2005/apt--main--0--patch-112
   Swedish translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-113
   Silly update to French translation (testing)

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

 * bubulle@debian.org--2005/apt--main--0--patch-115
   Basque translation completed

 * 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-63
   * changelog update

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

 * 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--mvo--0--patch-72
   * corrections in the changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
   * init the default ScreenWidth to 79 columns by default (Closes: #324921)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
   apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
   * seting section to "admin" to match override file

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
   * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78
   * fix a incorrect example

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79
   * revert patch from patch-59, causes all sorts of trouble

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80
   * fix changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81
   * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL

 * 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

2 files changed, 105 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 7cbcdc61e..14f565453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,107 @@
+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)
+  * added armeb to archtable (closes: #333599)
+   
+ -- 
+
+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
+    (thanks to Filipus Klutiero, closes: #282918)
+  * apt-pkg/pkgrecords.cc:
+    - revert patch from last version, it causes trouble on alpha 
+      and ia64 (closes: #335102, #335103)
+  * cmdline/apt-get.cc:
+    - be extra carefull in FindSrc (closes: #335213)
+
+ -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200
+
+apt (0.6.42) unstable; urgency=low
+
+  * apt-pkg/cdrom.cc:
+    - unmount the cdrom when apt failed to locate any package files
+  * allow cdrom failures and fallback to other sources in that case
+    (closes: #44135)
+  * better error text when dpkg-source fails
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
+    - patch-99: Added Galician translation
+    - patch-100: Completed Danish translation (Closes: #325686)
+    - patch-104: French translation completed
+    - patch-109: Italian translation completed
+    - patch-112: Swedish translation update
+    - patch-115: Basque translation completed (Closes: #333299)
+  * applied french man-page update (thanks to Philippe Batailler)
+    (closes: #316638, #327456)
+  * fix leak in the mmap code, thanks to Daniel Burrows for the
+    patch (closes: #250583)
+  * support for apt-get [build-dep|source] -t (closes: #152129)
+  * added "APT::Authentication::TrustCDROM" 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)
+  * init the default ScreenWidth to 79 columns by default
+    (Closes: #324921)
+  * cmdline/apt-cdrom.cc:
+    - fix some missing gettext() calls (closes: #334539)
+  * doc/apt-cache.8.xml: fix typo (closes: #334714)
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
+
+apt (0.6.41) unstable; urgency=low
+
+  * improved the support for "error" and "conffile" reporting from
+    dpkg, added the format to README.progress-reporting
+  * added README.progress-reporting to the apt-doc package
+  * improved the network timeout handling, if a index file from a
+    sources.list times out or EAI_AGAIN is returned from getaddrinfo,
+    don't try to get the other files from that entry
+  * Support architecture-specific extra overrides
+    (closes: #225947). Thanks to  Anthony Towns for idea and
+    the patch, thanks to Colin Watson for testing it.
+  * Javier Fernandez-Sanguino Pen~a:
+    - Added a first version of an apt-secure.8 manpage, and modified
+      apt-key and apt.end accordingly. Also added the 'update'
+      argument to apt-key which was previously not documented
+      (Closes: #322120)
+  * Andreas Pakulat:
+    - added example apt-ftparchive.conf file to doc/examples
+      (closes: #322483)
+  * Fix a incorrect example in the man-page (closes: #282918)
+  * Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
+  * Fix a manual page bug (closes: #316314)
+  * Do md5sum checking for file and cdrom method (closes: #319142)
+  * Change pkgPolicy::Pin from private to protected to let subclasses
+    access it too (closes: #321799)
+  * add default constructor for PrvIterator (closes: #322267)
+  * Reread status configuration on debSystem::Initialize()
+    (needed for apt-proxy, thanks to Otavio for this patch)
+
+ -- Michael Vogt <mvo@debian.org>  Mon,  5 Sep 2005 22:59:03 +0200
+  
 apt (0.6.40.1ubuntu8) breezy; urgency=low
 
   * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
diff --git a/debian/control b/debian/control
index 6d9418a46..4aa7b5aa2 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
 Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
-Section: base
+Section: admin
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a