* merged with mainline

diff --cc configure.in
index fc4eff203d5fead71051b9cbdf75c1c8976e6574,fc4eff203d5fead71051b9cbdf75c1c8976e6574..f0b0d6703af0f057455389e7258eefc6230852fd
--- 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.45")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index c658fe4004350e372e3269fb7113624892b4b114,e748fcebbac19dc8dc5749b7441e1f15ae0f25a5..ec802a80c44ab6f9dec0fd94c398c4c3078cfe4a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,10 +1,10 @@@
 - --
+ apt (0.6.45.1) unstable; urgency=low
+ 
+   * debian/control:
+     - switched to libdb4.4 for building
+ 
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  9 Aug 2006 14:27:54 +0200
+ 
  apt (0.6.45) unstable; urgency=low
  
    * apt-pkg/contrib/sha256.cc: