diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-27 13:15:46 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-27 13:15:46 +0200 |
| commit | 9e830fd5e9c71c384275f0c63dfe80595723d614 (patch) | |
| tree | 73814a89052c1108286eb4704dca40b5191c4c4b | |
| parent | 625034652b68e5619af154f09779003e1f3117dd (diff) | |
| parent | a7955daaf532107f70d70d4baa8f7692f6dd048a (diff) | |
* fixed compile errors with g++ 7.3 (thanks to
Daniel Burrows, closes: #429378)
* fix FTFBFS by changing build-depends to
libcurl4-gnutls-dev (closes: #428363)
| -rw-r--r-- | apt-pkg/contrib/strutl.h | 1 | ||||
| -rw-r--r-- | apt-pkg/depcache.h | 1 | ||||
| -rw-r--r-- | apt-pkg/pkgcachegen.h | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 |
6 files changed, 14 insertions, 3 deletions
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index ae1244ecd..53146ced7 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -20,6 +20,7 @@ #include <stdlib.h> #include <string> +#include <cstring> #include <vector> #include <iostream> #include <time.h> diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 84fed7f37..7adf6fe7f 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -45,6 +45,7 @@ #include <regex.h> #include <vector> +#include <memory> class pkgDepCache : protected pkgCache::Namespace { diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index a47b097b3..b6715294a 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -51,7 +51,7 @@ class pkgCacheGenerator // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); diff --git a/configure.in b/configure.in index 59e3d6fe1..d20c79680 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.7.2ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index fccdaf90e..50c050dcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.2ubuntu2) gutsy; urgency=low + + * fixed compile errors with g++ 7.3 (thanks to + Daniel Burrows, closes: #429378) + * fix FTFBFS by changing build-depends to + libcurl4-gnutls-dev (closes: #428363) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Jun 2007 13:47:03 +0200 + apt (0.7.2ubuntu1) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: diff --git a/debian/control b/debian/control index 7dc0b377f..ffb387b62 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org> Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5) +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apt/ubuntu |