From cac86917004df9905f537d6163be4ec7eaa31aa3 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 20 Nov 2019 23:42:23 +0200
Subject: [PATCH] apt: unsplit libapt-pkg as apt depends on it

---
 packages/apt/build.sh                 | 6 +++---
 packages/apt/libapt-pkg.subpackage.sh | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 packages/apt/libapt-pkg.subpackage.sh

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 415ee1233..7389b9c75 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.4.9
-TERMUX_PKG_REVISION=23
+TERMUX_PKG_REVISION=24
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d
 # apt-key requires utilities from coreutils, findutils, gpgv, grep, sed.
 TERMUX_PKG_DEPENDS="coreutils, dpkg, findutils, gpgv, grep, libc++, libcurl, liblzma, sed, termux-licenses, zlib"
-TERMUX_PKG_CONFLICTS="apt-transport-https"
-TERMUX_PKG_REPLACES="apt-transport-https"
+TERMUX_PKG_CONFLICTS="apt-transport-https, libapt-pkg"
+TERMUX_PKG_REPLACES="apt-transport-https, libapt-pkg"
 TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
 TERMUX_PKG_SUGGESTS="gnupg, unstable-repo, x11-repo"
 TERMUX_PKG_ESSENTIAL=true
diff --git a/packages/apt/libapt-pkg.subpackage.sh b/packages/apt/libapt-pkg.subpackage.sh
deleted file mode 100644
index 83f9e5644..000000000
--- a/packages/apt/libapt-pkg.subpackage.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-TERMUX_SUBPKG_DESCRIPTION="Header files and libraries for libapt-pkg and libapt-inst"
-TERMUX_SUBPKG_INCLUDE="
-include/apt-pkg
-lib/libapt-pkg.so
-lib/libapt-inst.so
-"