From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 15 Sep 2015 00:13:29 +0000 (-0400)
Subject: Add TERMUX_PKG_CONFLICTS support
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/a8c61c7d20a186d09a661c4d107bcbc29e4da97a?ds=inline

Add TERMUX_PKG_CONFLICTS support
---

diff --git a/build-package.sh b/build-package.sh
index 4f733453..af260526 100755
--- 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