From: SoonKyu Park Date: Mon, 11 Apr 2016 05:22:33 +0000 (+0900) Subject: Handle conflict from git merge release-20160315 X-Git-Tag: staging-released-tools-18.01.7~32^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6c1097dcca7d6e21701b5da8e02fadf9133bb5a;p=tools%2Fgbs.git Handle conflict from git merge release-20160315 --- f6c1097dcca7d6e21701b5da8e02fadf9133bb5a diff --cc debian/changelog index 27bb4fa,25f7bb5..2728902 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,13 +1,12 @@@ - gbs (0.23.3) unstable; urgency=high - * upgrade to gbs v0.23.3, which contains the following bug fixing & features: + gbs (0.24) unstable; urgency=high + * upgrade to gbs v0.24, which contains the following bug fixing & features: * bug fix: - - export: fix issue about always creating tarball multi times - for native packages with multi specs + - fix Security issues that normal user can gain root permission with gbs chroot + - fix git-build-package bugs and imporve some performance + *Add --fail-fast option. - -- Li Jinjing Mon, 20 Apr 2015 10:36:15 +0800 + -- Wang Jun Wed, 2 Mar 2016 10:00:00 +0800 - gbs (0.23.2) unstable; urgency=high * upgrade to gbs v0.23.2, which contains the following bug fixing & features: * bug fix: