gnupg: unsplit dirmngr

See issue https://github.com/termux/termux-packages/issues/4524.

packages/gnupg/build.sh

@@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.2.17
-TERMUX_PKG_SHA256=afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libsqlite,libnpth,readline,pinentry,libgpg-error,zlib"
-TERMUX_PKG_CONFLICTS="gnupg2 (<< 2.2.9-1)"
-TERMUX_PKG_REPLACES="gnupg2 (<< 2.2.9-1)"
+TERMUX_PKG_SHA256=afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514
+TERMUX_PKG_DEPENDS="libassuan, libbz2, libgcrypt, libgnutls, libgpg-error, libksba, libnpth, libsqlite, readline, pinentry, resolv-conf, zlib"
+TERMUX_PKG_CONFLICTS="gnupg2 (<< 2.2.9-1), dirmngr (<< 2.2.17-1)"
+TERMUX_PKG_REPLACES="gnupg2 (<< 2.2.9-1), dirmngr (<< 2.2.17-1)"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-ldap
 --enable-sqlite

packages/gnupg/dirmngr.subpackage.sh

@@ -1,3 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="bin/dirmngr bin/dirmngr-client share/man/man8/dirmngr.8.gz share/man/man1/dirmngr-client.1.gz"
-TERMUX_SUBPKG_DESCRIPTION="Server for managing certificate revocation lists"
-TERMUX_SUBPKG_DEPENDS="libgnutls, resolv-conf"