* merged with the current auto-mark branch

diff --cc configure.in
index f0eb6e8f978e94462ca251ceb5d1fd5ee957efa4,6d42f340e231f0410cd58824c176eedd7e0b7d97..5b60e30705ad6009ccc562468b359981ea9d9c70
--- 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.44.2exp1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2exp2")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index d213480473fa0afbfc51617709dadd40000905b1,8b11ff0da37fb181ba677161bc246d23f39e6131..73bd84f216fc83921010c0a62bf984717607956f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,3 +1,20 @@@
++apt (0.6.44.2exp2) experimental; urgency=low
++
++  * fix apt-get dist-upgrade
++  * fix warning if no /var/lib/apt/extended_states is present
++
++ -- Michael Vogt <mvo@debian.org>  Tue, 25 Jul 2006 15:12:05 +0200
++
 +apt (0.6.44.2exp1) experimental; urgency=low
 +
 +  * added support for i18n of the package descriptions
 +  * added support for aptitude like auto-install tracking (a HUGE
 +    HUGE thanks to Daniel Burrows who made this possible) 
 +  * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
 +  * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
 +
 + -- Michael Vogt <mvo@debian.org>  Mon,  3 Jul 2006 21:50:31 +0200
 +
  apt (0.6.44.2) unstable; urgency=low
  
    * apt-pkg/depcache.cc: