diff -Nru libept-1.1+nmu3build1/debian/changelog libept-1.1+nmu3ubuntu1/debian/changelog --- libept-1.1+nmu3build1/debian/changelog 2016-11-01 20:41:08.000000000 +0000 +++ libept-1.1+nmu3ubuntu1/debian/changelog 2019-06-17 15:55:32.000000000 +0000 @@ -1,3 +1,15 @@ +libept (1.1+nmu3ubuntu1) eoan; urgency=medium + + * Port to apt 1.9.0 + + -- Julian Andres Klode Mon, 17 Jun 2019 17:55:32 +0200 + +libept (1.1+nmu3build2) eoan; urgency=high + + * No change rebuild against apt 1.9.0. + + -- Julian Andres Klode Mon, 17 Jun 2019 13:09:35 +0200 + libept (1.1+nmu3build1) zesty; urgency=medium * Rebuild against new libxapian30. diff -Nru libept-1.1+nmu3build1/debian/control libept-1.1+nmu3ubuntu1/debian/control --- libept-1.1+nmu3build1/debian/control 2015-11-28 20:04:48.000000000 +0000 +++ libept-1.1+nmu3ubuntu1/debian/control 2019-06-17 15:54:39.000000000 +0000 @@ -1,12 +1,13 @@ Source: libept Section: libdevel Priority: optional -Maintainer: Enrico Zini +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Enrico Zini Uploaders: Petr Rockai Build-Depends: debhelper (>= 9), dh-exec, dh-buildinfo, cmake (>= 2.6), pkg-config, doxygen, - libapt-pkg-dev (>= 1.1~), + libapt-pkg-dev (>= 1.9~), libxapian-dev (>= 1.2.21-1.2) Standards-Version: 3.9.6.0 Vcs-Git: git://git.debian.org/git/debtags/libept.git @@ -17,7 +18,7 @@ Architecture: any Recommends: pkg-config Depends: - libept1.5.0 (= ${binary:Version}), + libept1.5.90 (= ${binary:Version}), libapt-pkg-dev (>= 1.0.10), libxapian-dev (>= 1.2.21-1.2), ${misc:Depends} Description: High-level library for managing Debian package information The library defines a very minimal framework in which many sources of data @@ -32,7 +33,7 @@ . This is the development library. -Package: libept1.5.0 +Package: libept1.5.90 Section: libs Architecture: any Multi-Arch: same diff -Nru libept-1.1+nmu3build1/debian/libept1.5.0.install libept-1.1+nmu3ubuntu1/debian/libept1.5.0.install --- libept-1.1+nmu3build1/debian/libept1.5.0.install 2015-11-28 20:04:48.000000000 +0000 +++ libept-1.1+nmu3ubuntu1/debian/libept1.5.0.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Do not remove the APT library version or the next APT ABI break -# will produce a libept package with old name, but new library inside. -debian/tmp/usr/lib/*/libept.so.1.aptpkg5.0 diff -Nru libept-1.1+nmu3build1/debian/libept1.5.90.install libept-1.1+nmu3ubuntu1/debian/libept1.5.90.install --- libept-1.1+nmu3build1/debian/libept1.5.90.install 1970-01-01 00:00:00.000000000 +0000 +++ libept-1.1+nmu3ubuntu1/debian/libept1.5.90.install 2019-06-17 15:53:41.000000000 +0000 @@ -0,0 +1,3 @@ +# Do not remove the APT library version or the next APT ABI break +# will produce a libept package with old name, but new library inside. +debian/tmp/usr/lib/*/libept.so.1.aptpkg5.90 diff -Nru libept-1.1+nmu3build1/ept/apt/apt.cc libept-1.1+nmu3ubuntu1/ept/apt/apt.cc --- libept-1.1+nmu3build1/ept/apt/apt.cc 2015-11-28 20:04:48.000000000 +0000 +++ libept-1.1+nmu3ubuntu1/ept/apt/apt.cc 2019-06-17 15:53:22.000000000 +0000 @@ -23,10 +23,12 @@ #include "apt.h" #include "ept/utils/sys.h" #include +#include #include #include #include #include +#include #include #include #include @@ -112,7 +114,7 @@ if (!m_list->ReadMainList()) throw Exception("reading list of sources"); - bool res = pkgMakeStatusCache(*m_list, progress, &m, true); + bool res = pkgCacheGenerator::MakeStatusCache(*m_list, &progress, &m, true); progress.Done(); if (!res) throw Exception("Reading the package lists or status file"); @@ -147,7 +149,7 @@ if (!m_depcache) { m_depcache = new pkgCacheFile; - if (!m_depcache->Open(progress, false)) + if (!m_depcache->Open(&progress, false)) throw Exception("Opening the cache file"); } return *m_depcache; @@ -261,8 +263,6 @@ { //cerr << "Needs open/reopen" << endl; lastFile = pkgCache::PkgFileIterator(apt.cache(), vflist[idx]->File + apt.cache().PkgFileP); - if (!lastFile.IsOk()) - throw Exception(string("Reading the data record for a package from file ") + lastFile.FileName()); //cerr << "Ok for " << lastFile.FileName() << endl; if (file.IsOpen()) file.Close(); @@ -606,9 +606,6 @@ // Check and load the package list file pkgCache::PkgFileIterator pfi = vfi.File(); - if (!pfi.IsOk()) - throw Exception(string("Reading the data record for a package version from file ") + pfi.FileName()); - FileFd pkgf(pfi.FileName(), FileFd::ReadOnly); if (_error->PendingError() == true) return std::string(); diff -Nru libept-1.1+nmu3build1/ept/apt/apt-test.cc libept-1.1+nmu3ubuntu1/ept/apt/apt-test.cc --- libept-1.1+nmu3build1/ept/apt/apt-test.cc 2015-11-28 20:04:48.000000000 +0000 +++ libept-1.1+nmu3ubuntu1/ept/apt/apt-test.cc 2019-06-17 15:55:14.000000000 +0000 @@ -1,5 +1,7 @@ #include "ept/test.h" #include "apt.h" + +#include #include #include diff -Nru libept-1.1+nmu3build1/ept/progresscallback.h libept-1.1+nmu3ubuntu1/ept/progresscallback.h --- libept-1.1+nmu3build1/ept/progresscallback.h 2015-11-28 20:04:48.000000000 +0000 +++ libept-1.1+nmu3ubuntu1/ept/progresscallback.h 2019-06-17 15:54:04.000000000 +0000 @@ -6,6 +6,7 @@ #ifndef EPT_PROGRESSCALLBACK_H #define EPT_PROGRESSCALLBACK_H +#include #include namespace ept { @@ -17,7 +18,7 @@ public: ProgressCallback() {}; virtual ~ProgressCallback() {}; - virtual bool MediaChange( string, string ) { return false; } // bah + virtual bool MediaChange(std::string, std::string ) { return false; } // bah // override this to get periodic updates virtual void UpdatePulse( double, double, unsigned long ) {}