diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-19 11:49:08 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-19 11:49:08 +0200 |
| commit | a7955daaf532107f70d70d4baa8f7692f6dd048a (patch) | |
| tree | 784221c2fc91918a40299d9ee657d10ef5fc3540 | |
| parent | 8a7bd39bdc6e993cd64c639e9e535a380846c2e9 (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-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 |
5 files changed, 13 insertions, 2 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/debian/changelog b/debian/changelog index 41609bd74..ea8113e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.3) unstable; 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) + + -- + apt (0.7.2) unstable; urgency=low * merged the debian/experimental changes back diff --git a/debian/control b/debian/control index 5686926d4..760c0176f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important 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://bzr.debian.org/apt/debian-sid/ |