Merge branch 'pu/merge-libraries'

5 files changed, 43 insertions, 87 deletions

diff --git a/debian/control b/debian/control
index 4aca00b95..26ab624ef 100644
--- a/debian/control
+++ b/debian/control
@@ -94,19 +94,6 @@ Description: package management runtime library
     http(s), rsh as well as an interface to add more transports like
     tor+http(s) (apt-transport-tor).
 
-Package: libapt-inst3.0
-Architecture: any
-Multi-Arch: same
-Priority: optional
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Section: libs
-Provides: libapt-inst (= ${binary:Version})
-Description: deb package format runtime library
- This library provides methods to query and extract information
- from deb packages. This includes the control data and the package
- file content.
-
 Package: apt-doc
 Architecture: all
 Priority: optional
@@ -121,8 +108,7 @@ Architecture: any
 Multi-Arch: same
 Priority: optional
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libapt-inst (= ${binary:Version}),
-         libapt-pkg (= ${binary:Version}),
+Depends: libapt-pkg (= ${binary:Version}),
          zlib1g-dev,
          ${misc:Depends}
 Section: libdevel
@@ -146,7 +132,6 @@ Description: documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: apt (= ${binary:Version}),
-         libapt-inst3.0 (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: package management related utility programs
diff --git a/debian/libapt-inst3.0.install b/debian/libapt-inst3.0.install
deleted file mode 100644
index a8ddd5e2d..000000000
--- a/debian/libapt-inst3.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libapt-inst*.so.*
-usr/share/locale/*/*/libapt-inst*.mo
diff --git a/debian/libapt-inst3.0.symbols b/debian/libapt-inst3.0.symbols
deleted file mode 100644
index 67f095116..000000000
--- a/debian/libapt-inst3.0.symbols
+++ /dev/null
@@ -1,68 +0,0 @@
-libapt-inst.so.3.0 libapt-inst3.0 #MINVER#
-* Build-Depends-Package: libapt-pkg-dev
- (c++)"ExtractTar::Done()@APTINST_3.0" 1.1~exp12
- (c++)"ExtractTar::Go(pkgDirStream&)@APTINST_3.0" 0.8.0
- (c++)"ExtractTar::StartGzip()@APTINST_3.0" 0.8.0
- (c++)"ExtractTar::ExtractTar(FileFd&, unsigned long long, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >)@APTINST_3.0" 1.0.5
- (c++)"ExtractTar::~ExtractTar()@APTINST_3.0" 0.8.0
- (c++)"debDebFile::GotoMember(char const*)@APTINST_3.0" 0.8.0
- (c++)"debDebFile::CheckMember(char const*)@APTINST_3.0" 0.8.0
- (c++)"debDebFile::ControlExtract::DoItem(pkgDirStream::Item&, int&)@APTINST_3.0" 0.8.0
- (c++)"debDebFile::ExtractTarMember(pkgDirStream&, char const*)@APTINST_3.0" 0.9.15.4
- (c++)"debDebFile::ExtractArchive(pkgDirStream&)@APTINST_3.0" 0.8.0
- (c++)"debDebFile::MemControlExtract::TakeControl(void const*, unsigned long long)@APTINST_3.0" 1.0.5
- (c++)"debDebFile::MemControlExtract::Read(debDebFile&)@APTINST_3.0" 0.8.0
- (c++)"debDebFile::MemControlExtract::DoItem(pkgDirStream::Item&, int&)@APTINST_3.0" 0.8.0
- (c++)"debDebFile::MemControlExtract::Process(pkgDirStream::Item&, unsigned char const*, unsigned long long, unsigned long long)@APTINST_3.0" 1.0.5
- (c++)"debDebFile::debDebFile(FileFd&)@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::FinishedFile(pkgDirStream::Item&, int)@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::CheckDirReplace(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int)@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::HandleOverwrites(pkgFLCache::NodeIterator, bool)@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::Fail(pkgDirStream::Item&, int)@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::DoItem(pkgDirStream::Item&, int&)@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::Aborted()@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::Finished()@APTINST_3.0" 0.8.0
- (c++)"pkgExtract::pkgExtract(pkgFLCache&, pkgCache::VerIterator)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::TreeLookup(unsigned int*, char const*, char const*, unsigned long, unsigned int*, bool)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::AddConfFile(char const*, char const*, pkgFLCache::PkgIterator const&, unsigned char const*)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::AddDiversion(pkgFLCache::PkgIterator const&, char const*, char const*)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::BeginDiverLoad()@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::FinishDiverLoad()@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::GetPkg(char const*, char const*, bool)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::Header::Header()@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::GetNode(char const*, char const*, unsigned int, bool, bool)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::DropNode(unsigned int)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::HashNode(pkgFLCache::NodeIterator const&)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::PrintTree(unsigned int, unsigned long)@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::pkgFLCache(DynamicMMap&)@APTINST_3.0" 0.8.0
- (c++)"pkgDirStream::FinishedFile(pkgDirStream::Item&, int)@APTINST_3.0" 0.8.0
- (c++)"pkgDirStream::Fail(pkgDirStream::Item&, int)@APTINST_3.0" 0.8.0
- (c++)"pkgDirStream::DoItem(pkgDirStream::Item&, int&)@APTINST_3.0" 0.8.0
- (c++)"ARArchive::LoadHeaders()@APTINST_3.0" 0.8.0
- (c++)"ARArchive::ARArchive(FileFd&)@APTINST_3.0" 0.8.0
- (c++)"ARArchive::~ARArchive()@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::NodeIterator::RealPackage() const@APTINST_3.0" 0.8.0
- (c++)"pkgFLCache::Header::CheckSizes(pkgFLCache::Header&) const@APTINST_3.0" 0.8.0
- (c++)"ARArchive::FindMember(char const*) const@APTINST_3.0" 0.8.0
- (c++)"typeinfo for ExtractTar@APTINST_3.0" 0.8.0
- (c++)"typeinfo for pkgExtract@APTINST_3.0" 0.8.0
- (c++)"typeinfo for pkgDirStream@APTINST_3.0" 0.8.0
- (c++)"typeinfo for debDebFile::ControlExtract@APTINST_3.0" 0.8.0
- (c++)"typeinfo for debDebFile::MemControlExtract@APTINST_3.0" 0.8.0
- (c++)"typeinfo name for ExtractTar@APTINST_3.0" 0.8.0
- (c++)"typeinfo name for pkgExtract@APTINST_3.0" 0.8.0
- (c++)"typeinfo name for pkgDirStream@APTINST_3.0" 0.8.0
- (c++)"typeinfo name for debDebFile::ControlExtract@APTINST_3.0" 0.8.0
- (c++)"typeinfo name for debDebFile::MemControlExtract@APTINST_3.0" 0.8.0
- (c++)"vtable for ExtractTar@APTINST_3.0" 0.8.0
- (c++)"vtable for pkgExtract@APTINST_3.0" 0.8.0
- (c++)"vtable for pkgDirStream@APTINST_3.0" 0.8.0
- (c++)"vtable for debDebFile::ControlExtract@APTINST_3.0" 0.8.0
- (c++)"vtable for debDebFile::MemControlExtract@APTINST_3.0" 0.8.0
-### gcc artifacts
- (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@APTINST_3.0" 0.8.12
- (c++|optional=std)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>(char*, char*, std::forward_iterator_tag)@APTINST_3.0" 1.7.0~alpha3~
- (c++|optional=std)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char const*>(char const*, char const*, std::forward_iterator_tag)@APTINST_3.0" 1.7.0~alpha3~
-### symbol versioning
- APTINST_3.0@APTINST_3.0 1.1~exp9
-### try to ignore std:: template instances
diff --git a/debian/libapt-pkg-dev.install b/debian/libapt-pkg-dev.install
index 563e99909..eea242896 100644
--- a/debian/libapt-pkg-dev.install
+++ b/debian/libapt-pkg-dev.install
@@ -1,4 +1,3 @@
 usr/include/apt-pkg/
-usr/lib/*/libapt-inst*.so
 usr/lib/*/libapt-pkg*.so
 usr/lib/*/pkgconfig/apt-*.pc
diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols
index 5be6fa880..a850daa09 100644
--- a/debian/libapt-pkg6.0.symbols
+++ b/debian/libapt-pkg6.0.symbols
@@ -1471,3 +1471,45 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER#
  (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [6], char const (&) [5], char const (&) [6], char const (&) [3], char const (&) [3], int>(char const (&) [6], char const (&) [5], char const (&) [6], char const (&) [3], char const (&) [3], int&&)@APTPKG_6.0" 1.7.0~alpha3~
  (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [6], char const (&) [5], char const (&) [6], decltype(nullptr), decltype(nullptr), int>(char const (&) [6], char const (&) [5], char const (&) [6], decltype(nullptr)&&, decltype(nullptr)&&, int&&)@APTPKG_6.0" 1.7.0~alpha3~
  (c++|optional=std)"void std::vector<re_pattern_buffer*, std::allocator<re_pattern_buffer*> >::emplace_back<re_pattern_buffer*>(re_pattern_buffer*&&)@APTPKG_6.0" 1.7.0~alpha3~
+* Build-Depends-Package: libapt-pkg-dev
+ (c++)"ExtractTar::Done()@APTPKG_6.0" 1.1~exp12
+ (c++)"ExtractTar::Go(pkgDirStream&)@APTPKG_6.0" 0.8.0
+ (c++)"ExtractTar::StartGzip()@APTPKG_6.0" 0.8.0
+ (c++)"ExtractTar::ExtractTar(FileFd&, unsigned long long, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >)@APTPKG_6.0" 1.0.5
+ (c++)"ExtractTar::~ExtractTar()@APTPKG_6.0" 0.8.0
+ (c++)"debDebFile::GotoMember(char const*)@APTPKG_6.0" 0.8.0
+ (c++)"debDebFile::CheckMember(char const*)@APTPKG_6.0" 0.8.0
+ (c++)"debDebFile::ControlExtract::DoItem(pkgDirStream::Item&, int&)@APTPKG_6.0" 0.8.0
+ (c++)"debDebFile::ExtractTarMember(pkgDirStream&, char const*)@APTPKG_6.0" 0.9.15.4
+ (c++)"debDebFile::ExtractArchive(pkgDirStream&)@APTPKG_6.0" 0.8.0
+ (c++)"debDebFile::MemControlExtract::TakeControl(void const*, unsigned long long)@APTPKG_6.0" 1.0.5
+ (c++)"debDebFile::MemControlExtract::Read(debDebFile&)@APTPKG_6.0" 0.8.0
+ (c++)"debDebFile::MemControlExtract::DoItem(pkgDirStream::Item&, int&)@APTPKG_6.0" 0.8.0
+ (c++)"debDebFile::MemControlExtract::Process(pkgDirStream::Item&, unsigned char const*, unsigned long long, unsigned long long)@APTPKG_6.0" 1.0.5
+ (c++)"debDebFile::debDebFile(FileFd&)@APTPKG_6.0" 0.8.0
+ (c++)"pkgDirStream::FinishedFile(pkgDirStream::Item&, int)@APTPKG_6.0" 0.8.0
+ (c++)"pkgDirStream::Fail(pkgDirStream::Item&, int)@APTPKG_6.0" 0.8.0
+ (c++)"pkgDirStream::DoItem(pkgDirStream::Item&, int&)@APTPKG_6.0" 0.8.0
+ (c++)"ARArchive::LoadHeaders()@APTPKG_6.0" 0.8.0
+ (c++)"ARArchive::ARArchive(FileFd&)@APTPKG_6.0" 0.8.0
+ (c++)"ARArchive::~ARArchive()@APTPKG_6.0" 0.8.0
+ (c++)"ARArchive::FindMember(char const*) const@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo for ExtractTar@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo for pkgDirStream@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo for debDebFile::ControlExtract@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo for debDebFile::MemControlExtract@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo name for ExtractTar@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo name for pkgDirStream@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo name for debDebFile::ControlExtract@APTPKG_6.0" 0.8.0
+ (c++)"typeinfo name for debDebFile::MemControlExtract@APTPKG_6.0" 0.8.0
+ (c++)"vtable for ExtractTar@APTPKG_6.0" 0.8.0
+ (c++)"vtable for pkgDirStream@APTPKG_6.0" 0.8.0
+ (c++)"vtable for debDebFile::ControlExtract@APTPKG_6.0" 0.8.0
+ (c++)"vtable for debDebFile::MemControlExtract@APTPKG_6.0" 0.8.0
+### gcc artifacts
+ (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@APTPKG_6.0" 0.8.12
+ (c++|optional=std)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>(char*, char*, std::forward_iterator_tag)@APTPKG_6.0" 1.7.0~alpha3~
+ (c++|optional=std)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char const*>(char const*, char const*, std::forward_iterator_tag)@APTPKG_6.0" 1.7.0~alpha3~
+### symbol versioning
+ APTPKG_6.0@APTINST_3.0 1.1~exp9
+### try to ignore std:: template instances