* merged with apt--mvo

Patches applied:

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

 * bubulle@debian.org--2005/apt--main--0--patch-161
   Galician translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-162
   Spanish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-163
   Two strings corrected in the British translation

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

 * bubulle@debian.org--2005/apt--main--0--patch-165
   Completed Greek translation

 * bubulle@debian.org--2005/apt--main--0--patch-166
   Fix some permissions

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120
   * added debian-archive-keyring to recommends

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122
   * fix apt-key to ask for the correct package

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123
   * fix typo in apt-cache.8 manpage

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124
   * fixed another typo in doc/apt-secure.8.xml

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125
   * merged the debian-sid changes back

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126
   * fixed the changelog yet again

diff --combined debian/changelog
index 020fe9813e75f91ede019acec48b54f70ffe0ffc,46ab68da5420c586c78072b4b2ad993a8fd8a2e7..3c3fbb4a9d8589dbdab28fb58ff802c64f8c2836
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,25 +1,25 @@@
  apt (0.6.43.2) unstable; urgency=low
  
-   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
-     - en_GB.po, de.po: fix spaces errors in "Ign " translations
-       Closes: #347258
+   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
+     - en_GB.po, de.po: fix spaces errors in "Ign " translations Closes: #347258
      - makefile: make update-po a pre-requisite of clean target so
-               that POT and PO files are always up-to-date
+               that POT and PO files are always up-to-date
      - sv.po: Completed to 511t. Closes: #346450
      - sk.po: Completed to 511t. Closes: #346369
      - fr.po: Completed to 511t
      - *.po: Updated from sources (511 strings)
+     - el.po: Completed to 511 strings Closes: #344642
+     - da.po: Completed to 511 strings Closes: #348574
+     - es.po: Updated to 510t1f Closes: #348158
+     - gl.po: Completed to 511 strings Closes: #347729
+     - it.po: Yet another update Closes: #347435
+   * added debian-archive-keyring to the Recommends (closes: #347970)
+   * fixed message in apt-key to install debian-archive-keyring 
+   * typos fixed in apt-cache.8 (closes: #348348, #347349)
    * add patch to fix http download corruption problem (thanks to
      Petr Vandrovec, closes: #280844, #290694)
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
 - --
++ -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
  
  apt (0.6.43.1) unstable; urgency=low