* merged with mainline

Patches applied:

 * 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

 * 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

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

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

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

1 files changed, 40 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 42056b1b7..544c5b9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,59 @@
-apt (0.6.43.1ubuntu1) dapper; urgency=low
+apt (0.6.43.3) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+  	* 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
+	* vi.po: Completed to 512 strings
+	* 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
+	* LINGUAS: Add Welsh
+	* *.po: Updated from sources (512 strings)
+	* vi.po: Completed to 511 strings
+	         Closes: #348968
+  * 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 
+
+ -- 
+
+apt (0.6.43.2) unstable; urgency=low
 
   * 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
+    - 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
-    - *.po: Updated from sources (511 strings)
+  * 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)
   * added APT::Periodic::Unattended-Upgrade (requires the package
     "unattended-upgrade")
 
- -- 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