From feed3cf75a4a173bb2359b133736141c6463f58c Mon Sep 17 00:00:00 2001 From: "(Holloway) Chew, Kean Ho" Date: Mon, 1 Oct 2018 18:48:43 +0800 Subject: [PATCH 1/3] manta/DEBIAN/control: fix coreutils dependencies version at 8.21 Launchpad complaint that Ubuntu Trusty and Ubuntu Xenial couldn't support coreutils at version 8.26. Hence, the builds for both of those series failed. This patch sets the coreutils version support from 8.21 onwards. Since bashell is merely a shell script, it should not compromise too many functionalities. Signed-off-by: (Holloway) Chew, Kean Ho --- manta/DEBIAN/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manta/DEBIAN/control b/manta/DEBIAN/control index 6ef8906..270a1da 100644 --- a/manta/DEBIAN/control +++ b/manta/DEBIAN/control @@ -2,13 +2,13 @@ Source: bashell Section: devel Priority: optional Maintainer: ZORALab Enterprise -Build-Depends: debhelper (>=9), bash (>=4.3), coreutils (>=8.26-3) +Build-Depends: debhelper (>=9), bash (>=4.3), coreutils (>=8.21) Standards-Version: 3.9.8 Homepage: https://gitlab.com/ZORALab/BaSHELL Package: bashell Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends}, bash (>= 4.3), coreutils (>=8.26-3) +Depends: ${misc:Depends}, ${shlibs:Depends}, bash (>= 4.3), coreutils (>=8.21) Description: This package bashell provides a way to unit-testing bash scripts. A simple git repository framework for unit-testing your bash script. BaSHELL itself is a bash script too. Now, you can perform unit-testing and early -- GitLab From 6d27d7b7b1597de13835588886064f781f093303 Mon Sep 17 00:00:00 2001 From: "(Holloway) Chew, Kean Ho" Date: Mon, 1 Oct 2018 18:52:38 +0800 Subject: [PATCH 2/3] manta/manta.cfg: disable upstream for debian unstable The existing debian mentor has a detailed process for adding software into the mainstream. At the moment, we can't proceed with upstreaming to Debian Mentor without detailed study about the processes. This patch set debian unstable upstream back to none. Signed-off-by: (Holloway) Chew, Kean Ho --- manta/manta.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manta/manta.cfg b/manta/manta.cfg index 175496e..fb0ab06 100644 --- a/manta/manta.cfg +++ b/manta/manta.cfg @@ -56,7 +56,7 @@ deb_distributions=( "0ubuntu1~bionicppa1-bionic|ubuntu-launchpad" "0ubuntu1~xenialppa1-xenial|ubuntu-launchpad" "0ubuntu1~trustyppa1-trusty|ubuntu-launchpad" - "debian-unstable|debian-mentors" + "debian-unstable|none" "debian-stable|none" ) -- GitLab From 9aca32421b1535e6831ae838f65fa11affad2dcc Mon Sep 17 00:00:00 2001 From: "(Holloway) Chew, Kean Ho" Date: Mon, 1 Oct 2018 18:56:19 +0800 Subject: [PATCH 3/3] root: releasing 1.4.2 This patch marks as release 1.4.2. Signed-off-by: (Holloway) Chew, Kean Ho --- CHANGELOG.md | 6 ++++++ bashell.sh | 2 +- manta/DEBIAN/changelog | 7 +++++++ manta/SNAP/snapcraft.yaml | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e7d9c7..ea8f4e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Version 1.4.2 +## Mon, 01 Oct 2018 18:55:34 +0800 - (Urgency: low) +-------------------------------------------------------------------------------- +1. 6d27d7b manta/manta.cfg: disable upstream for debian unstable +2. feed3cf manta/DEBIAN/control: fix coreutils dependencies version at 8.21 + # Version 1.4.1 ## Mon, 01 Oct 2018 17:46:33 +0800 - (Urgency: low) -------------------------------------------------------------------------------- diff --git a/bashell.sh b/bashell.sh index 86c4bd7..bcda9b9 100755 --- a/bashell.sh +++ b/bashell.sh @@ -19,7 +19,7 @@ ################################################################################ export SOFTWARE_NAME="bashell" export SOFTWARE_DESCRIPTION="a simple bash for unit-testing your BASH scripts." -export VERSION="1.4.1" +export VERSION="1.4.2" export CURRENT_DIRECTORY="$PWD" export SCRIPT_DIRECTORY="$CURRENT_DIRECTORY/scripts" export LOCAL_BASHELL_PATH="$SCRIPT_DIRECTORY/bashell.sh" diff --git a/manta/DEBIAN/changelog b/manta/DEBIAN/changelog index 716b2ed..e494f26 100644 --- a/manta/DEBIAN/changelog +++ b/manta/DEBIAN/changelog @@ -1,3 +1,10 @@ +bashell (1.4.2DISTTAG) DISTSERIES; urgency=low + + *manta/manta.cfg: disable upstream for debian unstable + *manta/DEBIAN/control: fix coreutils dependencies version at 8.21 + + -- ZORALab Enterprise Mon, 01 Oct 2018 18:55:34 +0800 + bashell (1.4.1DISTTAG) DISTSERIES; urgency=low *manta/SNAP/snapcraft.yaml: updated version to match 1.4.0 diff --git a/manta/SNAP/snapcraft.yaml b/manta/SNAP/snapcraft.yaml index aa10b6e..e016c03 100644 --- a/manta/SNAP/snapcraft.yaml +++ b/manta/SNAP/snapcraft.yaml @@ -1,5 +1,5 @@ name: bashell -version: '1.4.1' +version: '1.4.2' summary: A simple BASH script for unit-testing all your BASH scripts description: | bashell is a high level shell program designed to test bash script -- GitLab