From dfe2511e31f232a8a8880eba40af40d1deb0e49c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 May 2019 11:40:08 +0200 Subject: [PATCH] Merge libapt-inst into libapt-pkg --- CMakeLists.txt | 1 - abicheck/apt_build.xml.in | 1 - apt-inst/CMakeLists.txt | 31 ---------- apt-inst/apt-inst.pc.in | 9 --- apt-inst/dpkg-diffs.txt | 5 -- {apt-inst => apt-pkg}/contrib/arfile.cc | 0 {apt-inst => apt-pkg}/contrib/arfile.h | 0 {apt-inst => apt-pkg}/contrib/extracttar.cc | 0 {apt-inst => apt-pkg}/contrib/extracttar.h | 0 {apt-inst => apt-pkg}/deb/debfile.cc | 0 {apt-inst => apt-pkg}/deb/debfile.h | 0 {apt-inst => apt-pkg}/dirstream.cc | 0 {apt-inst => apt-pkg}/dirstream.h | 0 cmdline/CMakeLists.txt | 8 +-- debian/control | 17 +----- debian/libapt-inst3.0.install | 2 - debian/libapt-inst3.0.symbols | 68 --------------------- debian/libapt-pkg-dev.install | 1 - debian/libapt-pkg6.0.symbols | 42 +++++++++++++ ftparchive/CMakeLists.txt | 2 +- po/CMakeLists.txt | 7 --- prepare-release | 5 +- test/interactive-helper/CMakeLists.txt | 4 +- test/libapt/CMakeLists.txt | 2 +- 24 files changed, 52 insertions(+), 153 deletions(-) delete mode 100644 apt-inst/CMakeLists.txt delete mode 100644 apt-inst/apt-inst.pc.in delete mode 100644 apt-inst/dpkg-diffs.txt rename {apt-inst => apt-pkg}/contrib/arfile.cc (100%) rename {apt-inst => apt-pkg}/contrib/arfile.h (100%) rename {apt-inst => apt-pkg}/contrib/extracttar.cc (100%) rename {apt-inst => apt-pkg}/contrib/extracttar.h (100%) rename {apt-inst => apt-pkg}/deb/debfile.cc (100%) rename {apt-inst => apt-pkg}/deb/debfile.h (100%) rename {apt-inst => apt-pkg}/dirstream.cc (100%) rename {apt-inst => apt-pkg}/dirstream.h (100%) delete mode 100644 debian/libapt-inst3.0.install delete mode 100644 debian/libapt-inst3.0.symbols diff --git a/CMakeLists.txt b/CMakeLists.txt index e47e867bf..2a06da34f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,7 +232,6 @@ configure_file(CMake/apti18n.h.in ${PROJECT_BINARY_DIR}/include/apti18n.h) add_subdirectory(vendor) add_subdirectory(apt-pkg) add_subdirectory(apt-private) -add_subdirectory(apt-inst) add_subdirectory(cmdline) add_subdirectory(completions) add_subdirectory(doc) diff --git a/abicheck/apt_build.xml.in b/abicheck/apt_build.xml.in index 32886d931..ec3946648 100644 --- a/abicheck/apt_build.xml.in +++ b/abicheck/apt_build.xml.in @@ -8,5 +8,4 @@ @build_path@/apt-pkg/ - @build_path@/apt-inst/ diff --git a/apt-inst/CMakeLists.txt b/apt-inst/CMakeLists.txt deleted file mode 100644 index e4e91e493..000000000 --- a/apt-inst/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Include apt-pkg directly, as some files have #include -include_directories(${PROJECT_BINARY_DIR}/include/apt-pkg) - -# Set the version of the library -set(MAJOR 3.0) -set(MINOR 0) -set(APT_INST_MAJOR ${MAJOR} PARENT_SCOPE) - -# Definition of the C++ files used to build the library - note that this -# is expanded at CMake time, so you have to rerun cmake if you add or remove -# a file (you can just run cmake . in the build directory) -file(GLOB_RECURSE library "*.cc") -file(GLOB_RECURSE headers "*.h") - -configure_file(apt-inst.pc.in ${CMAKE_CURRENT_BINARY_DIR}/apt-inst.pc @ONLY) - -# Create a library using the C++ files -add_library(apt-inst SHARED ${library}) - -# Link the library and set the SONAME -target_link_libraries(apt-inst PUBLIC apt-pkg ${CMAKE_THREAD_LIBS_INIT}) -target_link_libraries(apt-inst PRIVATE ${CMAKE_THREAD_LIBS_INIT}) -set_target_properties(apt-inst PROPERTIES VERSION ${MAJOR}.${MINOR}) -set_target_properties(apt-inst PROPERTIES SOVERSION ${MAJOR}) -add_version_script(apt-inst) - -# Install the library and the headers -install(TARGETS apt-inst LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/apt-pkg) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-inst.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -flatify(${PROJECT_BINARY_DIR}/include/apt-pkg/ "${headers}") diff --git a/apt-inst/apt-inst.pc.in b/apt-inst/apt-inst.pc.in deleted file mode 100644 index 1d61a202f..000000000 --- a/apt-inst/apt-inst.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - -Name: apt-inst -Description: deb package format runtime library -Version: @PROJECT_VERSION@ -Libs: -L${libdir} -lapt-inst -Cflags: -I${includedir} -Requires: apt-pkg diff --git a/apt-inst/dpkg-diffs.txt b/apt-inst/dpkg-diffs.txt deleted file mode 100644 index d161055f7..000000000 --- a/apt-inst/dpkg-diffs.txt +++ /dev/null @@ -1,5 +0,0 @@ -- Replacing directories with files - dpkg permits this with the weak condition that the directory is owned only - by the package. APT requires that the directory have no files that are not - owned by the package. Replaces are specifically not checked to prevent - file list corruption. diff --git a/apt-inst/contrib/arfile.cc b/apt-pkg/contrib/arfile.cc similarity index 100% rename from apt-inst/contrib/arfile.cc rename to apt-pkg/contrib/arfile.cc diff --git a/apt-inst/contrib/arfile.h b/apt-pkg/contrib/arfile.h similarity index 100% rename from apt-inst/contrib/arfile.h rename to apt-pkg/contrib/arfile.h diff --git a/apt-inst/contrib/extracttar.cc b/apt-pkg/contrib/extracttar.cc similarity index 100% rename from apt-inst/contrib/extracttar.cc rename to apt-pkg/contrib/extracttar.cc diff --git a/apt-inst/contrib/extracttar.h b/apt-pkg/contrib/extracttar.h similarity index 100% rename from apt-inst/contrib/extracttar.h rename to apt-pkg/contrib/extracttar.h diff --git a/apt-inst/deb/debfile.cc b/apt-pkg/deb/debfile.cc similarity index 100% rename from apt-inst/deb/debfile.cc rename to apt-pkg/deb/debfile.cc diff --git a/apt-inst/deb/debfile.h b/apt-pkg/deb/debfile.h similarity index 100% rename from apt-inst/deb/debfile.h rename to apt-pkg/deb/debfile.h diff --git a/apt-inst/dirstream.cc b/apt-pkg/dirstream.cc similarity index 100% rename from apt-inst/dirstream.cc rename to apt-pkg/dirstream.cc diff --git a/apt-inst/dirstream.h b/apt-pkg/dirstream.h similarity index 100% rename from apt-inst/dirstream.h rename to apt-pkg/dirstream.h diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt index 8977b45d1..d82239bee 100644 --- a/cmdline/CMakeLists.txt +++ b/cmdline/CMakeLists.txt @@ -29,10 +29,10 @@ target_link_libraries(apt-cdrom apt-pkg apt-private) target_link_libraries(apt-helper apt-pkg apt-private) target_link_libraries(apt-mark apt-pkg apt-private) target_link_libraries(apt-sortpkgs apt-pkg apt-private) -target_link_libraries(apt-extracttemplates apt-pkg apt-inst apt-private) -target_link_libraries(apt-internal-solver apt-pkg apt-inst apt-private) -target_link_libraries(apt-dump-solver apt-pkg apt-inst apt-private) -target_link_libraries(apt-internal-planner apt-pkg apt-inst apt-private) +target_link_libraries(apt-extracttemplates apt-pkg apt-private) +target_link_libraries(apt-internal-solver apt-pkg apt-private) +target_link_libraries(apt-dump-solver apt-pkg apt-private) +target_link_libraries(apt-internal-planner apt-pkg apt-private) set_target_properties(apt-dump-solver PROPERTIES RUNTIME_OUTPUT_DIRECTORY solvers 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, std::allocator >)@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, std::allocator >, 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 >::~vector()@APTINST_3.0" 0.8.12 - (c++|optional=std)"void std::__cxx11::basic_string, std::allocator >::_M_construct(char*, char*, std::forward_iterator_tag)@APTINST_3.0" 1.7.0~alpha3~ - (c++|optional=std)"void std::__cxx11::basic_string, std::allocator >::_M_construct(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 >::emplace_back(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 >::emplace_back(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 >::emplace_back(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, std::allocator >)@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 >::~vector()@APTPKG_6.0" 0.8.12 + (c++|optional=std)"void std::__cxx11::basic_string, std::allocator >::_M_construct(char*, char*, std::forward_iterator_tag)@APTPKG_6.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::__cxx11::basic_string, std::allocator >::_M_construct(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 diff --git a/ftparchive/CMakeLists.txt b/ftparchive/CMakeLists.txt index bbd2848c1..9aa6606f1 100644 --- a/ftparchive/CMakeLists.txt +++ b/ftparchive/CMakeLists.txt @@ -7,7 +7,7 @@ add_executable(apt-ftparchive ${source}) # Link the executables against the libraries target_include_directories(apt-ftparchive PRIVATE ${BERKELEY_DB_INCLUDE_DIRS}) -target_link_libraries(apt-ftparchive apt-inst apt-pkg apt-private ${BERKELEY_DB_LIBRARIES}) +target_link_libraries(apt-ftparchive apt-pkg apt-private ${BERKELEY_DB_LIBRARIES}) # Install the executables install(TARGETS apt-ftparchive RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index a8893e8ba..c03d6d03e 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -31,18 +31,11 @@ apt_add_translation_domain( EXCLUDE_LANGUAGES ${languages_excluded} ) -apt_add_translation_domain( - DOMAIN libapt-inst${APT_INST_MAJOR} - TARGETS apt-inst - EXCLUDE_LANGUAGES ${languages_excluded} -) - apt_add_update_po( TEMPLATE apt-all DOMAINS libapt-pkg${APT_PKG_MAJOR} - libapt-inst${APT_INST_MAJOR} apt apt-utils EXCLUDE_LANGUAGES diff --git a/prepare-release b/prepare-release index ea749f85d..919450b33 100755 --- a/prepare-release +++ b/prepare-release @@ -11,7 +11,6 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')" -LIBAPTINSTVERSION="$(sed -nr 's/set\(MAJOR ([^)]*)\)/\1/p' apt-inst/CMakeLists.txt)" librarysymbolsfromfile() { local MISSING="$(grep '^+#MISSING' "$1")" @@ -64,7 +63,6 @@ if [ "$1" = 'pre-export' ]; then } libraryversioncheck 'libapt-pkg' "$LIBAPTPKGVERSION" - libraryversioncheck 'libapt-inst' "$LIBAPTINSTVERSION" if [ "$DISTRIBUTION" = 'sid' ]; then @@ -181,7 +179,6 @@ elif [ "$1" = 'library' ]; then } librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}" echo - librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}" elif [ "$1" = 'buildlog' ]; then while [ -n "$2" ]; do librarysymbolsfromfile "$2" 'UNKNOWN' @@ -222,7 +219,7 @@ elif [ "$1" = 'coverage' ]; then } grep 'build/include/' "${DIR}/apt.coverage.fixed" | sed "s#^SF:$(pwd)/##" | while read file; do rewritefile "$file" 'apt-pkg' 'apt-pkg/deb' 'apt-pkg/edsp' 'apt-pkg/contrib' \ - 'apt-inst' 'apt-inst/deb' 'apt-inst/contrib' 'apt-private' + 'apt-private' done genhtml --output-directory "${DIR}" "${DIR}/apt.coverage.fixed" ${LCOVRC} elif [ "$1" = 'spellcheckers' -o "$1" = 'lint' ]; then diff --git a/test/interactive-helper/CMakeLists.txt b/test/interactive-helper/CMakeLists.txt index 5a32ca17e..f4238665d 100644 --- a/test/interactive-helper/CMakeLists.txt +++ b/test/interactive-helper/CMakeLists.txt @@ -1,9 +1,9 @@ add_executable(mthdcat mthdcat.cc) target_link_libraries(mthdcat apt-pkg) add_executable(testdeb testdeb.cc) -target_link_libraries(testdeb apt-pkg apt-inst) +target_link_libraries(testdeb apt-pkg) add_executable(extract-control extract-control.cc) -target_link_libraries(extract-control apt-pkg apt-inst) +target_link_libraries(extract-control apt-pkg) add_executable(aptwebserver aptwebserver.cc) target_link_libraries(aptwebserver apt-pkg ${CMAKE_THREAD_LIBS_INIT}) add_executable(aptdropprivs aptdropprivs.cc) diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt index 035ff07b1..57ef5ac3f 100644 --- a/test/libapt/CMakeLists.txt +++ b/test/libapt/CMakeLists.txt @@ -1,4 +1,4 @@ -set(PROJECT_TEST_LIBRARIES apt-private apt-inst) +set(PROJECT_TEST_LIBRARIES apt-private) find_path(GTEST_ROOT src/gtest.cc /usr/src/googletest/googletest /usr/src/gtest