diff options
| author | Michael Vogt <mvo@debian.org> | 2005-10-20 15:22:35 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2005-10-20 15:22:35 +0000 |
| commit | c32d54cd0e110c510a7bb88c8ef88e79e7ee1edd (patch) | |
| tree | 7884b3c00c705644ed79d351d770863664a2362d | |
| parent | d64805b9d9bb6df1ca22aff8ad040b5288c996eb (diff) | |
| parent | 487d7faaa8d789507b901cead8d7803c98af2bd3 (diff) | |
* 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
| -rw-r--r-- | cmdline/apt-cache.cc | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 94cfab14f..810dbe7b0 100644 --- 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 9816858a8..084c9edd0 100644 --- 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) |