Explorar el Código

* 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 hace 19 años
padre
commit
9e830fd5e9
Se han modificado 6 ficheros con 14 adiciones y 3 borrados
  1. 1 0
      apt-pkg/contrib/strutl.h
  2. 1 0
      apt-pkg/depcache.h
  3. 1 1
      apt-pkg/pkgcachegen.h
  4. 1 1
      configure.in
  5. 9 0
      debian/changelog
  6. 1 1
      debian/control

+ 1 - 0
apt-pkg/contrib/strutl.h

@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <iostream>
 #include <time.h>

+ 1 - 0
apt-pkg/depcache.h

@@ -45,6 +45,7 @@
 #include <regex.h>
 
 #include <vector>
+#include <memory>
 
 class pkgDepCache : protected pkgCache::Namespace
 {

+ 1 - 1
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);

+ 1 - 1
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)

+ 9 - 0
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:

+ 1 - 1
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