* merge with apt--ddtp--0

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-17
   * merged with mainline

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-18
   * fix a off-by-one error when showing the description

diff --cc configure.in
index 9816858a83e0cb29b1691f3a2e49754408104a66,87dac8e47e7c4741a8f02815b351885513f60232..084c9edd0d75718258fed548b74babdfe9f0305e
--- 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.41.0exp2")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.42.0exp1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)