* 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 --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 94cfab14f743ad10d20103b813fa74a9632c73a4..810dbe7b021d8d07747a739372c74442ba226ce7 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1229,7 +1229,7 @@ bool DisplayRecord(pkgCache::VerIterator V)
    const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:");
 
    // Write all but Description
-   if (fwrite(Buffer,1,DescP - Buffer-1,stdout) < (size_t)(DescP - Buffer-1))
+   if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))
    {
       delete [] Buffer;
       return false;

diff --git a/configure.in b/configure.in
index 9816858a83e0cb29b1691f3a2e49754408104a66..084c9edd0d75718258fed548b74babdfe9f0305e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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.42.0exp1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)