Skip to content

Commit

Permalink
Improve generation of debian changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
jlaska committed Apr 9, 2015
1 parent 1e7f7bf commit bbc05a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions packaging/debian/changelog
Original file line number Diff line number Diff line change
@@ -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. <[email protected]> Fri, 01 Jan 2016 00:00:00 -0500
-- Ansible, Inc. <[email protected]> %DATE%
>>>>>>> Stashed changes

ansible (1.9.0.1) unstable; urgency=low

Expand Down

0 comments on commit bbc05a2

Please sign in to comment.