summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-04-06 22:53:22 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-04-06 22:53:22 +0400
commit92fe724cf6f1a163b9799b53fcfb0181e0f3d250 (patch)
tree461fbacc1514e1e0e967095a7aff257d663223e6 /debian
parentb40d6043d2873e9dde63b7647d3da47f58973c5c (diff)
downloadapt-92fe724cf6f1a163b9799b53fcfb0181e0f3d250.tar.gz
Updated debian/libapt-pkg4.12.symbols
Diffstat (limited to 'debian')
-rw-r--r--debian/libapt-pkg4.12.symbols15
1 files changed, 0 insertions, 15 deletions
diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols
index 46eb8b3d..3be07329 100644
--- a/debian/libapt-pkg4.12.symbols
+++ b/debian/libapt-pkg4.12.symbols
@@ -1423,14 +1423,8 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
(c++)"APT::VersionContainerInterface::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
(c++)"APT::VersionContainerInterface::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
(c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list<APT::VersionContainerInterface::Modifier, std::allocator<APT::VersionContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
-<<<<<<< HEAD
(c++|arch=!illumos-amd64)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9
(c++|arch=illumos-amd64)"EDSP::WriteLimitedScenario(pkgDepCache&, __FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.9.15+dyson1
- (c++|arch=!illumos-amd64)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.8.16~exp9
- (c++|arch=illumos-amd64)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, __FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.9.15+dyson1
-=======
- (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9
->>>>>>> ec4371acb7bf586b4ed274b47813e5785da6b424
(c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
(c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
(c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
@@ -1464,15 +1458,10 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
### rework of the packagemanager rework
(c++)"APT::Progress::PackageManager::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
- (c++)"APT::Progress::PackageManagerFancy::GetNumberTerminalRows()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::HandleSIGWINCH(int)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1
-<<<<<<< HEAD
- (c++)"APT::Progress::PackageManagerFancy::Start(int)@Base" 0.9.15
-=======
->>>>>>> ec4371acb7bf586b4ed274b47813e5785da6b424
(c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1
@@ -1496,10 +1485,6 @@ libapt-pkg-4.12.so libapt-pkg4.12 #MINVER#
(c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1
-<<<<<<< HEAD
- (c++)"APT::Progress::PackageManager::Start(int)@Base" 0.9.15
-=======
->>>>>>> ec4371acb7bf586b4ed274b47813e5785da6b424
(c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1