* merged with debian-sid branch

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

 * bubulle@debian.org--2005/apt--main--0--patch-167
   Resync with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-168
   Vietnamese translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-169
   Update PO files and POT file...again

 * bubulle@debian.org--2005/apt--main--0--patch-170
   Compelted French translation

 * bubulle@debian.org--2005/apt--main--0--patch-171
   Activate Welsh translation

 * bubulle@debian.org--2005/apt--main--0--patch-172
   Completed to 512 strings

 * bubulle@debian.org--2005/apt--main--0--patch-173
   Russian translation completed

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

 * bubulle@debian.org--2005/apt--main--0--patch-175
   Merge from Philippe Batailler French manpages tree/Vietnamese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-176
   Galician translation update

 * bubulle@debian.org--2005/apt--main--0--patch-177
   Slovak translation update

 * bubulle@debian.org--2005/apt--main--0--patch-178
   Polish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-179
   Correct permissions

 * bubulle@debian.org--2005/apt--main--0--patch-180
   Japanese translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-182
   Catalan translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-183
   Brazilian Portuguese translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-185
   Japanese manpages translation update

 * bubulle@debian.org--2005/apt--main--0--patch-186
   Simplified Chinese translation update

 * 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

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128
   * don't explod if a Provides has DepCompareOp

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129
   * fix regression about not working --print-uris in "install"

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131
   * create sources.list.d as well

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-132
   * make apt-cache madion wotk without deb-src lines

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-133
   * only clean out the list dir if the update was successful

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-134
   * only remove the sigfile if pkgAcqMetaSig::Failed() didn't fail for a network error

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-135
   tyop

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

 * mvo@debian.org--2005/apt--debian-sid--0--patch-18
   * merged with apt--mvo

 * mvo@debian.org--2005/apt--debian-sid--0--patch-19
   * synced with mainline

 * mvo@debian.org--2005/apt--debian-sid--0--patch-20
   * merged with mainline, finalized changelog

 * philippe.batailler@free.fr--2005/apt--main--0--patch-9
   manpages

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

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

diff --cc cmdline/apt-cache.cc
Simple merge

diff --cc configure.in
Simple merge

diff --cc debian/changelog
index b54cb63,64c743a..d2e7802
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,34 +1,44 @@@
- apt (0.6.43.2exp1) experimental; urgency=low
++apt (0.6.43.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)
 +
-  -- Michael Vogt <mvo@debian.org>  Thu, 12 Jan 2006 23:40:32 +0100
++ -- Michael Vogt <mvo@debian.org>  Wed,  1 Mar 2006 13:34:15 +0100
++
+ apt (0.6.43.3) unstable; urgency=low
+ 
+   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
+     * ca.po: Completed to 512t. Closes: #351592
+     * eu.po: Completed to 512t. Closes: #350483
+     * ja.po: Completed to 512t. Closes: #349806
+     * pl.po: Completed to 512t. Closes: #349514
+     * sk.po: Completed to 512t. Closes: #349474
+     * gl.po: Completed to 512 strings Closes: #349407
+     * sv.po: Completed to 512 strings Closes: #349210
+     * ru.po: Completed to 512 strings Closes: #349154
+     * da.po: Completed to 512 strings Closes: #349084
+     * fr.po: Completed to 512 strings
+     * vi.po: Completed to 511 strings  Closes: #348968
+     * zh_CN.po: Completed to 512t. Closes: #353936
+     * it.po: Completed to 512t. Closes: #352803
+     * pt_BR.po: Completed to 512t. Closes: #352419
+     * LINGUAS: Add Welsh
+     * *.po: Updated from sources (512 strings)
+   * apt-pkg/deb/deblistparser.cc:
+     - don't explode on a DepCompareOp in a Provides line, but warn about
+       it and ignore it otherwise (thanks to James Troup for reporting it)
+   * cmdline/apt-get.cc:
+     - don't lock the lists directory in DoInstall, breaks --print-uri 
+       (thanks to James Troup for reporting it)
+   * debian/apt.dirs: create /etc/apt/sources.list.d 
+   * make apt-cache madison work without deb-src entries (#352583)
+   * cmdline/apt-get.cc: only run the list-cleaner if a update was 
+     successfull
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
  
  apt (0.6.43.2) unstable; urgency=low