From 21387eae3e084b25873057dad07d83eac62dd672 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sat, 27 Jul 2019 22:38:18 +0300 Subject: [PATCH] avoid duplicate parent package dependency for more subpackages Addition for 46e807e63430a591463db01d5b30980072865ff2. --- packages/binutils/binutils-gold.subpackage.sh | 1 - packages/libflac/flac.subpackage.sh | 1 - packages/libpulseaudio/pulseaudio.subpackage.sh | 1 - packages/libsqlite/sqlite.subpackage.sh | 2 +- packages/libtool/libltdl.subpackage.sh | 1 - packages/ncurses/ncurses-ui-libs.subpackage.sh | 1 - packages/ncurses/ncurses-utils.subpackage.sh | 1 - packages/openssl/openssl-tool.subpackage.sh | 1 - packages/ruby/ruby-ri.subpackage.sh | 1 - packages/rust/rust-std-wasm32.subpackage.sh | 1 - 10 files changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/binutils/binutils-gold.subpackage.sh b/packages/binutils/binutils-gold.subpackage.sh index 46e989bce..96eaebd98 100644 --- a/packages/binutils/binutils-gold.subpackage.sh +++ b/packages/binutils/binutils-gold.subpackage.sh @@ -1,3 +1,2 @@ TERMUX_SUBPKG_INCLUDE="bin/ld.gold bin/gold" -TERMUX_SUBPKG_DEPENDS="binutils" TERMUX_SUBPKG_DESCRIPTION="gold linker" diff --git a/packages/libflac/flac.subpackage.sh b/packages/libflac/flac.subpackage.sh index 3fbda5de9..903310aa9 100644 --- a/packages/libflac/flac.subpackage.sh +++ b/packages/libflac/flac.subpackage.sh @@ -1,3 +1,2 @@ TERMUX_SUBPKG_INCLUDE="bin/flac bin/metaflac share/man/man1" TERMUX_SUBPKG_DESCRIPTION="FLAC (Free Lossless Audio Codec) command-line tool" -TERMUX_SUBPKG_DEPENDS="libflac, libiconv" diff --git a/packages/libpulseaudio/pulseaudio.subpackage.sh b/packages/libpulseaudio/pulseaudio.subpackage.sh index 4743dc161..4949f2b75 100644 --- a/packages/libpulseaudio/pulseaudio.subpackage.sh +++ b/packages/libpulseaudio/pulseaudio.subpackage.sh @@ -1,4 +1,3 @@ TERMUX_SUBPKG_INCLUDE="bin/ etc/ lib/libcli.so* lib/libprotocol-*.so* lib/librtp.so* lib/pulse-${TERMUX_PKG_VERSION}/ share/" TERMUX_SUBPKG_DESCRIPTION="A featureful, general-purpose sound server" -TERMUX_SUBPKG_DEPENDS="libpulseaudio" TERMUX_SUBPKG_CONFFILES="etc/pulse/client.conf etc/pulse/daemon.conf etc/pulse/default.pa etc/pulse/system.pa" diff --git a/packages/libsqlite/sqlite.subpackage.sh b/packages/libsqlite/sqlite.subpackage.sh index 8d9eace7e..ccd924cca 100644 --- a/packages/libsqlite/sqlite.subpackage.sh +++ b/packages/libsqlite/sqlite.subpackage.sh @@ -1,3 +1,3 @@ TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" TERMUX_SUBPKG_DESCRIPTION="Command line shell for SQLite" -TERMUX_SUBPKG_DEPENDS="libsqlite, readline" +TERMUX_SUBPKG_DEPENDS="readline" diff --git a/packages/libtool/libltdl.subpackage.sh b/packages/libtool/libltdl.subpackage.sh index a2e04133e..ff92e5879 100644 --- a/packages/libtool/libltdl.subpackage.sh +++ b/packages/libtool/libltdl.subpackage.sh @@ -1,3 +1,2 @@ TERMUX_SUBPKG_INCLUDE="lib/libltdl.so" TERMUX_SUBPKG_DESCRIPTION="Library for dlopening libraries" -TERMUX_SUBPKG_CONFLICTS="libtool (<= 2.4.6-3)" diff --git a/packages/ncurses/ncurses-ui-libs.subpackage.sh b/packages/ncurses/ncurses-ui-libs.subpackage.sh index 81a2312d5..29520c700 100644 --- a/packages/ncurses/ncurses-ui-libs.subpackage.sh +++ b/packages/ncurses/ncurses-ui-libs.subpackage.sh @@ -1,3 +1,2 @@ TERMUX_SUBPKG_INCLUDE="lib/libform* lib/libmenu* lib/libpanel*" TERMUX_SUBPKG_DESCRIPTION="Libraries for terminal user interfaces based on ncurses" -TERMUX_SUBPKG_DEPENDS="ncurses" diff --git a/packages/ncurses/ncurses-utils.subpackage.sh b/packages/ncurses/ncurses-utils.subpackage.sh index 467850289..40f88c3b2 100644 --- a/packages/ncurses/ncurses-utils.subpackage.sh +++ b/packages/ncurses/ncurses-utils.subpackage.sh @@ -15,4 +15,3 @@ share/man/man1/infocmp.1.gz share/man/man1/tic.1.gz " TERMUX_SUBPKG_DESCRIPTION="Tools for working with terminals" -TERMUX_SUBPKG_DEPENDS="ncurses" diff --git a/packages/openssl/openssl-tool.subpackage.sh b/packages/openssl/openssl-tool.subpackage.sh index fe8c9b50a..af673bb66 100644 --- a/packages/openssl/openssl-tool.subpackage.sh +++ b/packages/openssl/openssl-tool.subpackage.sh @@ -1,3 +1,2 @@ TERMUX_SUBPKG_INCLUDE="bin" TERMUX_SUBPKG_DESCRIPTION="The openssl command line cryptographic tool" -TERMUX_SUBPKG_DEPENDS="openssl (>= 1.1.1b-1)" diff --git a/packages/ruby/ruby-ri.subpackage.sh b/packages/ruby/ruby-ri.subpackage.sh index b86c87931..ec2211683 100644 --- a/packages/ruby/ruby-ri.subpackage.sh +++ b/packages/ruby/ruby-ri.subpackage.sh @@ -1,4 +1,3 @@ TERMUX_SUBPKG_INCLUDE="share/ri share/man/man1/ri.1.gz bin/ri" TERMUX_SUBPKG_DESCRIPTION="Ruby documentation index" -TERMUX_SUBPKG_DEPENDS="ruby" TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true diff --git a/packages/rust/rust-std-wasm32.subpackage.sh b/packages/rust/rust-std-wasm32.subpackage.sh index 29857829b..a4a908f58 100644 --- a/packages/rust/rust-std-wasm32.subpackage.sh +++ b/packages/rust/rust-std-wasm32.subpackage.sh @@ -1,5 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="rust std for wasm32-unknown-unknown target" TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true TERMUX_SUBPKG_INCLUDE="lib/rustlib/wasm32-unknown-unknown" -TERMUX_SUBPKG_DEPENDS="rust" TERMUX_SUBPKG_REVISION=$TERMUX_PKG_REVISION