diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
| commit | bef425ae689899d3add1f6a26b888012803a7308 (patch) | |
| tree | 79ba0268c02129fbaaa1fb32c58904cb37ca1167 /apt-pkg/cacheset.h | |
| parent | 74ac981563c6ccfd5291b6b6b83e193afa8aa40b (diff) | |
| parent | 1c93747533dcf1cbbb2c743d0028ad157a7684a4 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
test/integration/test-kernel-helper-autoremove
Diffstat (limited to 'apt-pkg/cacheset.h')
| -rw-r--r-- | apt-pkg/cacheset.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 29103aad9..b69d74b8e 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -48,11 +48,17 @@ public: /*{{{*/ virtual void showTaskSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); virtual void showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + virtual void showFnmatchSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); +#endif virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, std::string const &ver, bool const verIsRel); virtual void canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); virtual void canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + virtual void canNotFindFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); +#endif virtual void canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str); virtual void canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); |