summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2022-04-21 03:01:22 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2022-05-07 10:45:44 +0200
commit8fd65748589bb1e0b671d4a291521bfba1664c5c (patch)
treef6eac6ea671ad466f4a616a957d7a8fc85e8ed0c
parent8d8b45a96ceceb015f7836cf25b99279c2f377b9 (diff)
Remove unused public zlib include from libapt fileutl.h
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
-rw-r--r--apt-pkg/contrib/fileutl.h3
-rw-r--r--apt-private/private-cmndline.cc1
-rw-r--r--apt-private/private-json-hooks.cc1
-rw-r--r--debian/control1
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 <vector>
#include <time.h>
-#include <zlib.h>
-
-
/* 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 <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <algorithm>
#include <iomanip>
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 <signal.h>
#include <sys/socket.h>
#include <sys/types.h>
+#include <unistd.h>
/**
* @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