Add TERMUX_PKG_CONFLICTS support

diff --git a/build-package.sh b/build-package.sh
index 4f7334539c6b6f244e101cd9b6bce38ffad4a794..af26052635eb0a234a3ed2f42a083b5076c019f1 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -175,6 +175,7 @@ TERMUX_PKG_FOLDERNAME=""
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="false"
 TERMUX_PKG_KEEP_HEADER_FILES="false"
 TERMUX_PKG_ESSENTIAL=""
+TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
 TERMUX_PKG_CONFFILES=""
 # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR:
 TERMUX_PKG_HOSTBUILD=""
@@ -642,6 +643,7 @@ Homepage: $TERMUX_PKG_HOMEPAGE
 HERE
 test ! -z "$TERMUX_PKG_DEPENDS" && echo "Depends: $TERMUX_PKG_DEPENDS" >> DEBIAN/control
 test ! -z "$TERMUX_PKG_ESSENTIAL" && echo "Essential: yes" >> DEBIAN/control
+test ! -z "$TERMUX_PKG_CONFLICTS" && echo "Conflicts: $TERMUX_PKG_CONFLICTS" >> DEBIAN/control
 
 # Create DEBIAN/conffiles (see https://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html):
 for f in $TERMUX_PKG_CONFFILES; do echo $TERMUX_PREFIX/$f >> DEBIAN/conffiles; done

diff --git a/disabled-packages/libutil/build.sh b/packages/libutil/build.sh
similarity index 100%
rename from disabled-packages/libutil/build.sh
rename to packages/libutil/build.sh

diff --git a/disabled-packages/libutil/pty.c b/packages/libutil/pty.c
similarity index 100%
rename from disabled-packages/libutil/pty.c
rename to packages/libutil/pty.c

diff --git a/disabled-packages/libutil/pty.h b/packages/libutil/pty.h
similarity index 100%
rename from disabled-packages/libutil/pty.h
rename to packages/libutil/pty.h