From: Michael Vogt <mvo@debian.org>
Date: Thu, 20 Oct 2005 15:22:35 +0000 (+0000)
Subject: * merge with apt--ddtp--0
X-Git-Tag: 0.7.21~284^2~43
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c32d54cd0e110c510a7bb88c8ef88e79e7ee1edd

* 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
---

c32d54cd0e110c510a7bb88c8ef88e79e7ee1edd
diff --cc configure.in
index 9816858a8,87dac8e47..084c9edd0
--- a/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)