cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10662 from jlaska/debian_changelog

Browse source 
Improve generation of debian changelog
This commit is contained in:
Brian Coca 2015-04-09 09:42:43 -04:00
commit cd852225f8
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -53,6 +53,7 @@ DEBUILD_BIN ?= debuild
DEBUILD_OPTS = --source-option="-I"
DPUT_BIN ?= dput
DPUT_OPTS ?=
DEB_DATE := $(shell date +"%a, %d %b %Y %T %z")
ifeq ($(OFFICIAL),yes)
DEB_RELEASE = $(RELEASE)ppa
# Sign OFFICIAL builds using 'DEBSIGN_KEYID'
@ -217,7 +218,7 @@ debian: sdist
mkdir -p deb-build/$${DIST} ; \
tar -C deb-build/$${DIST} -xvf dist/$(NAME)-$(VERSION).tar.gz ; \
cp -a packaging/debian deb-build/$${DIST}/$(NAME)-$(VERSION)/ ; \
sed -ie "s#^$(NAME) (\([^)]*\)) \([^;]*\);#ansible (\1-$(DEB_RELEASE)~$${DIST}) $${DIST};#" deb-build/$${DIST}/$(NAME)-$(VERSION)/debian/changelog ; \
sed -ie "s|%VERSION%|$(VERSION)|g;s|%RELEASE%|$(DEB_RELEASE)|;s|%DIST%|$${DIST}|g;s|%DATE%|$(DEB_DATE)|g" deb-build/$${DIST}/$(NAME)-$(VERSION)/debian/changelog ; \
done
deb: debian

7
packaging/debian/changelog
View file

@ -1,8 +1,9 @@
ansible (2.0.0) unstable; urgency=low
ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low
* 2.0.0 (in progress)
* %VERSION% release
-- Ansible, Inc. <support@ansible.com> Fri, 01 Jan 2016 00:00:00 -0500
-- Ansible, Inc. <support@ansible.com> %DATE%
>>>>>>> Stashed changes
ansible (1.9.0.1) unstable; urgency=low