From 8fd65748589bb1e0b671d4a291521bfba1664c5c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 21 Apr 2022 03:01:22 +0200 Subject: Remove unused public zlib include from libapt fileutl.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our public interface doesn't use zlib for quite a while now so lets drop the last remnants as hopefully nobody depends on us bringing it in… Unlike our own private lib for transitive provision of unistd.h. References: 680b916ce7203a40ebd0a3882b9a71ca77278a67 --- apt-pkg/contrib/fileutl.h | 3 --- apt-private/private-cmndline.cc | 1 + apt-private/private-json-hooks.cc | 1 + debian/control | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index dd16aa754..f4eefd7c2 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -28,9 +28,6 @@ #include #include -#include - - /* Define this for python-apt */ #define APT_HAS_GZIP 1 diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index e9af3a8c2..f607c4ccc 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/apt-private/private-json-hooks.cc b/apt-private/private-json-hooks.cc index 957140525..a17204dda 100644 --- a/apt-private/private-json-hooks.cc +++ b/apt-private/private-json-hooks.cc @@ -22,6 +22,7 @@ #include #include #include +#include /** * @brief Simple JSON writer diff --git a/debian/control b/debian/control index 7a91e0f05..58c6be15e 100644 --- a/debian/control +++ b/debian/control @@ -112,7 +112,6 @@ Multi-Arch: same Priority: optional Pre-Depends: ${misc:Pre-Depends} Depends: libapt-pkg (= ${binary:Version}), - zlib1g-dev, ${misc:Depends} Section: libdevel Description: development files for APT's libapt-pkg and libapt-inst -- cgit v1.2.3-70-g09d2