* merged with apt--mvo--0

Patches applied:

 * 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

diff --combined debian/changelog
index 078d2c8b27baff84f1f469ebcfae6a1048f4ea33,9ee7179d5ec21919d6a43719251de9eab70ad588..5cb00e5c82060c3c171aebac262340f22e64c64a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
--apt (0.6.41.1) unstable; urgency=low
++apt (0.6.42) unstable; urgency=low
  
    * apt-pkg/cdrom.cc:
      - unmount the cdrom when apt failed to locate any package files
@@@ -13,10 -13,10 +13,10 @@@
      - patch-112: Swedish translation update 
      - patch-115: Basque translation completed (Closes: #333299)
    * applied french man-page update (thanks to Philippe Batailler)
-     (closes: #316318, #327456)
+     (closes: #316638, #327456)
    * fix leak in the mmap code, thanks to Daniel Burrows for the
      patch (closes: #250583)
-   * support for apt-get source -t (and honor pining) (closes: #152129)
+   * support for apt-get [build-dep|source] -t (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)
@@@ -24,8 -24,13 +24,13 @@@
    * 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 21:33:46 +0200
  
  apt (0.6.41) unstable; urgency=low