diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-10-29 12:59:28 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-11-11 15:05:39 +0100 |
| commit | f4e0e9daf221e840e122b0ffa97007aa512020a6 (patch) | |
| tree | 4c5f3cee6326e7844565f873a778ba8541aee77b | |
| parent | 66d968268fbda200fe8036be2462b873ac4470ad (diff) | |
Move apt-extracttemplates to /usr/lib/apt in 'apt' package
This is useful on every system and only was in apt-utils for
historical reasons. Move it to the main apt package, and also
move it out of the path.
Add a symbolic link in /usr/bin to apt-utils and keep the manual
pages in tere.
| -rw-r--r-- | cmdline/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | debian/apt-utils.install | 1 | ||||
| -rw-r--r-- | debian/apt-utils.links | 2 | ||||
| -rw-r--r-- | debian/apt.install | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt index 28a14ddf9..ef6f8b35b 100644 --- a/cmdline/CMakeLists.txt +++ b/cmdline/CMakeLists.txt @@ -46,10 +46,9 @@ set_target_properties(apt-internal-planner # Install the executables install(TARGETS apt apt-cache apt-get apt-config apt-cdrom apt-mark apt-sortpkgs - apt-extracttemplates RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(TARGETS apt-helper RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/) +install(TARGETS apt-helper apt-extracttemplates RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/) install(TARGETS apt-dump-solver apt-internal-solver RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/solvers) install(TARGETS apt-internal-planner RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/planners) diff --git a/debian/apt-utils.install b/debian/apt-utils.install index 9b304e535..6c2978a4d 100644 --- a/debian/apt-utils.install +++ b/debian/apt-utils.install @@ -1,4 +1,3 @@ -usr/bin/apt-extracttemplates usr/bin/apt-ftparchive usr/bin/apt-sortpkgs usr/lib/apt/planners/ diff --git a/debian/apt-utils.links b/debian/apt-utils.links new file mode 100644 index 000000000..1324afce9 --- /dev/null +++ b/debian/apt-utils.links @@ -0,0 +1,2 @@ +../lib/apt/apt-extracttemplates usr/bin/apt-extracttemplates + diff --git a/debian/apt.install b/debian/apt.install index 767623a5a..07bc737fd 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -11,6 +11,7 @@ usr/bin/apt-key usr/bin/apt-mark usr/lib/*/libapt-private.so* usr/lib/apt/apt-helper +usr/lib/apt/apt-extracttemplates usr/lib/apt/methods/ usr/lib/apt/planners/dump usr/lib/apt/solvers/dump |