diff options
author | Michael Vogt <mvo@ubuntu.com> | 2015-05-07 10:41:34 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-07 10:41:34 +0200 |
commit | accd8215ca9a1cb10e92a059d71eb02aac2f0743 (patch) | |
tree | ad673f0421bf5dc2b3f6ab5e91f5dd074bd2661c /apt-pkg/pkgcache.h | |
parent | b32f5e0d93608f82a7516440a6da7a3131eb358e (diff) | |
parent | 4694e07d450baa13fa04482752ca369a5797c640 (diff) |
Merge branch 'debian/jessie' into ubuntu/master1.0.9.9ubuntu1
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'apt-pkg/pkgcache.h')
-rw-r--r-- | apt-pkg/pkgcache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 5e8a9630a..a7e520bc9 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -218,7 +218,7 @@ class pkgCache /*{{{*/ private: bool MultiArchEnabled; - PkgIterator SingleArchFindPkg(const std::string &Name); + APT_DEPRECATED PkgIterator SingleArchFindPkg(const std::string &Name); }; /*}}}*/ // Header structure /*{{{*/ |