From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 30 Jan 2017 01:10:22 +0000 (+0100)
Subject: build-package.sh: Remove broken subpackage logic
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/a15ad0de6d1ffca3671d58abfd12bbf2b6352bd5

build-package.sh: Remove broken subpackage logic
---

diff --git a/build-package.sh b/build-package.sh
index 87c78184..2a304d6e 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -827,10 +827,6 @@ termux_step_massage() {
 		else
 			echo "TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\"" >> "$_DEVEL_SUBPACKAGE_FILE"
 		fi
-		if [ x$TERMUX_PKG_CONFLICTS != x ]; then
-			# Assume that dev packages conflicts as well.
-			echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> "$_DEVEL_SUBPACKAGE_FILE"
-		fi
 	fi
 	# Now build all sub packages
 	rm -Rf "$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages"