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

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index ae1244ecd10b6e0efcce45814bfaefc28280773c..53146ced7a9e6c71d293e01f851aa51ca703390c 100644 (file)
--- 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 84fed7f3732fc455bdab2c298680928cfc7c1f17..7adf6fe7fa95bca222833f0742a53abd45b87037 100644 (file)
--- 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 a47b097b3185ead0650e4a3165df0345a4de6aca..b6715294af363aa6475f9a9089b632a8f5b1f0b0 100644 (file)
--- 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 41609bd743fae69e48c1296197873df0a4e5bae4..ea8113e95d3ca973d7842a4cfe1e5015ac25563c 100644 (file)
--- 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 5686926d45fd9258d275f85a6a57365680e98c91..760c0176f270097d48dbd7a695b07b7ac06ffcd9 100644 (file)
--- 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/