Commit c7c0eb8e authored by intrigeri's avatar intrigeri
Browse files

release script: adjust to work on current sid.

Jessie should have a gbp that supports this, but testing/sid doesn't support
the old way anymore.
parent 10dcf612
......@@ -4,9 +4,9 @@
#
# If "dev" is supplied as the second argument, a development snapshot
# is done rather than a real release, i.e.:
# * the --snapshot --auto options are passed to git-dch
# * the --snapshot --auto options are passed to gbp-dch
# * no commit or tag is created
# else, the second argument is passed to git-dch's --since option.
# else, the second argument is passed to gbp-dch's --since option.
### source the configuration files
......@@ -44,8 +44,8 @@ fatal () {
|| fatal "AMNESIA_DEV_KEYID must be set in config/amnesia"
[ -x "`which git`" ] \
|| fatal "could not find git, please apt-get install git-core"
[ -x "`which git-dch`" ] \
|| fatal "could not find git-dch, please apt-get install git-buildpackage"
[ -x "`which gbp`" ] \
|| fatal "could not find gbp, please apt-get install git-buildpackage"
### main
......@@ -54,13 +54,13 @@ export DEBEMAIL="${AMNESIA_DEV_EMAIL}"
# update the Changelog
echo "Updating debian/changelog from Git history..."
git-dch \
gbp dch \
`if [ ${SNAPSHOT} = yes ]; then echo '--snapshot --auto' ; fi` \
`if [ ${SNAPSHOT} = no -a -n ${SINCE} ]; then echo "--release --since=${SINCE}" ; fi` \
`if [ ${SNAPSHOT} = no -a -z ${SINCE} ]; then echo "--release --auto" ; fi` \
--new-version="${NEW_VERSION}" \
--ignore-branch \
|| fatal "git-dch failed."
|| fatal "gbp dch failed."
# cleanup some parts of the changelog
perl -pi'' -e 's/\A \[ IkiWiki::Plugin::po::change \]\n//' debian/changelog
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment