* merged with apts mainline

diff --cc configure.in
index bb15eeb,6d42f34..644eab9
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3ubuntu3")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-2ubuntu1
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index 08ba10a,3d5e3c5..83bf9c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,71 +1,97 @@@
++apt (0.6.44.2ubuntu1) edgy; urgency=low
++
++  * merged with debian/unstable
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 18:30:46 +0200
++
+ apt  (0.6.44.2) unstable; urgency=low 
+   
+    * apt-pkg/depcache.cc:
+      - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+    * apt-pkg/acquire-item.cc:
+      - fix missing chmod() in the new aquire code
+        (thanks to Bastian Blank, Closes: #367425)
+    * merged from
+      http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+      * sk.po: Completed to 512t
+      * eu.po: Completed to 512t
+      * fr.po: Completed to 512t
+      * sv.po: Completed to 512t
+      * Update all PO and the POT. Gives 506t6f for formerly
+        complete translations
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200 
+ 
+ apt (0.6.44.1-0.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Don't give an error when parsing empty Packages/Sources files.
+     (Closes: #366931, #367086, #370160)
+ 
+  -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 00:52:21 +0200
+ 
+ apt (0.6.44.1) unstable; urgency=low
+ 
+   * merged from 
+     http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+     - po/LINGUAS: added "bg" Closes: #360262
+     - po/gl.po: Galician translation update. Closes: #366849
+     - po/hu.po: Hungarian translation update. Closes: #365448
+     - po/cs.po: Czech translation updated. Closes: #367244
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 16 May 2006 21:51:16 +0200
+ 
+ apt (0.6.44) unstable; urgency=low
+ 
+   * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
+   * apt-pkg/deb/dpkgpm.cc: 
+     - wording fixes (thanks to Matt Zimmerman)
+     - fix error in dpkg interaction (closes: #364513, 
+       thanks to Martin Dickopp)
+   * apt-pkg/tagfile.{cc,h}:
+     - use MMap to read the entries (thanks to Zephaniah E. Hull for the
+       patch) Closes: #350025
+   * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+       * bg.po: Added, complete to 512t. Closes: #360262
+   * doc/apt-ftparchive.1.xml:
+     - fix documentation for "SrcPackages" -> "Sources" 
+       (thanks to Bart Martens for the patch, closes: #307756)
+   * debian/libapt-pkg-doc.doc-base.cache:
+     - remove broken charackter from description (closes: #361129)
+   * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: 
+     - i18n fixes (closes: #349298)
+   * debian/postinst: dont fail on not available
+     /usr/share/doc/apt/examples/sources.list (closes: #361130)
+   * methods/ftp.cc:
+     - unlink empty file in partial if the download failed because
+       the file is missing on the server (closes: #316337)
+   * apt-pkg/deb/debversion.cc:
+     - treats a version string with explicit zero epoch equal
+       than the same without epoch (Policy 5.6.12, closes: #363358)
+       Thanks to Lionel Elie Mamane for the patch
+   
+  -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:28:53 +0200
+ 
 +apt (0.6.43.3ubuntu3) dapper; urgency=low
 +
 +  * methods/http.cc:
 +    - fix the user-agent string
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 May 2006 18:09:32 +0200
 +
 +apt (0.6.43.3ubuntu2) dapper; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Apr 2006 13:24:40 +0200
 +
 +apt (0.6.43.3ubuntu1) dapper; urgency=low
 +
 +  * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in 
 +    the status-fd (ubuntu #28954)
 +
 + -- 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:

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 4d88d5b,a8bf887..333d4ad
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -341,6 -336,6 +341,6 @@@ cvs-mkul
  arch-build:
        rm -rf debian/arch-build
        mkdir -p debian/arch-build/apt-$(APT_DEBVER)
-       tar -c --exclude=arch-build -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -)
+       tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_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)