diff --git a/packages/build-essential/build.sh b/packages/build-essential/build.sh index 55fe48b27c..bc72e5a1a2 100644 --- a/packages/build-essential/build.sh +++ b/packages/build-essential/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A metapackage that installs essential development tools" TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=3.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_METAPACKAGE=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes @@ -17,7 +17,7 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes # bc, bzip2, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, xz-utils # -TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, bzip2, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux, xz-utils" +TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux, xz-utils" # Other packages that may be interesting. TERMUX_PKG_SUGGESTS="git, golang, nodejs, patchelf, proot, python, python2, ruby, rust, subversion" diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh index 34c3a25c12..21a47af2be 100644 --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg TERMUX_PKG_DESCRIPTION="Debian package management system" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.19.7 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8 # with the extract.c.patch we remove the -p and --warning=no-timestamp tar options so we can use busybox tar -TERMUX_PKG_DEPENDS="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib" +TERMUX_PKG_DEPENDS="coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib" TERMUX_PKG_BREAKS="dpkg-dev" TERMUX_PKG_REPLACES="dpkg-dev" TERMUX_PKG_ESSENTIAL=yes diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh index ab5a1a992c..ec1bbee2bd 100644 --- a/packages/libbz2/build.sh +++ b/packages/libbz2/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.bzip.org/ TERMUX_PKG_DESCRIPTION="BZ2 format compression library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.0.8 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f -TERMUX_PKG_BREAKS="libbz2-dev" -TERMUX_PKG_REPLACES="libbz2-dev" +TERMUX_PKG_BREAKS="bzip2, libbz2-dev" +TERMUX_PKG_REPLACES="bzip2, libbz2-dev" +TERMUX_PKG_PROVIDES="bzip2" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libbz2/bzip2.subpackage.sh b/packages/libbz2/bzip2.subpackage.sh deleted file mode 100644 index 02e2ae46e9..0000000000 --- a/packages/libbz2/bzip2.subpackage.sh +++ /dev/null @@ -1,3 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" -TERMUX_SUBPKG_DESCRIPTION="Tools for working with bzip2 compression" -TERMUX_SUBPKG_ESSENTIAL=yes diff --git a/packages/ncdc/build.sh b/packages/ncdc/build.sh index d988f32690..0fd8bfc12b 100644 --- a/packages/ncdc/build.sh +++ b/packages/ncdc/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://dev.yorhel.nl/ncdc TERMUX_PKG_DESCRIPTION="Modern and lightweight direct connect client with a friendly ncurses interface" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.22.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://dev.yorhel.nl/download/ncdc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d15fd378aa345f423e59a38691c668f69b516cd4b8afbbcdc446007740c3afad -TERMUX_PKG_DEPENDS="libandroid-support, libiconv, libgnutls, libsqlite, bzip2, glib, ncurses, zlib" +TERMUX_PKG_DEPENDS="libandroid-support, libbz2, libiconv, libgnutls, libsqlite, glib, ncurses, zlib" TERMUX_PKG_BUILD_IN_SRC="yes" termux_step_post_configure() { diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh index 60a7bf1d61..25ae200c30 100644 --- a/packages/termux-tools/build.sh +++ b/packages/termux-tools/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)" # Some of these packages are not dependencies and used only to ensure # that core packages are installed after upgrading (we removed busybox # from essentials). -TERMUX_PKG_DEPENDS="bzip2, coreutils, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec, xz-utils" +TERMUX_PKG_DEPENDS="coreutils, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec, xz-utils" # Optional packages that are distributed as part of bootstrap archives. TERMUX_PKG_RECOMMENDS="ed, dos2unix, inetutils, net-tools, patch, unzip, util-linux"