* merged with mainline

diff --cc debian/changelog
index 89d4185721f750078a15dbace09ae81f07b26420,c8a3271de0498745709adfd1ddf2d9b76f125fb6..98d5b0f6baa81440d6362c80f804218d3148b6b1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,28 +1,58 @@@
- apt (0.6.43.2ubuntu2) dapper; urgency=low
 -apt (0.6.43.4) unstable; urgency=low
++apt (0.6.43.3ubuntu1) dapper; urgency=low
  
    * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Mar 2006 19:16:23 +0200
 - --
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Mar 2006 20:34:46 +0200
+ 
+ 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
++    * 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
 -    * zh_CN.po: Completed to 512t. Closes: #353936
 -    * it.po: Completed to 512t. Closes: #352803
 -    * pt_BR.po: Completed to 512t. Closes: #352419
++  * 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
++  * apt-get update errors are only warnings nowdays
++  * be more careful with the signature file on network failures
++
++ --  Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
 +
 +apt (0.6.43.2ubuntu1) dapper; 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)

diff --cc debian/rules
index 34c947c69f90c4e1f4cbd33c74a0fd4250cdff1b,ebd3740fe4d3e1e9715ca748cfbcce2c503af12a..92931b6f8c38fa658f8200eeb2f63086150c0b30
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -340,6 -336,6 +341,6 @@@ cvs-mkul
  arch-build:
        rm -rf debian/arch-build
        mkdir -p debian/arch-build/apt-$(APT_DEBVER)
-       baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
+       tar -c --exclude=arch-build -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
        $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
 -      (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
 +      (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)