diff options
| author | James Laska <jlaska@ansible.com> | 2015-04-09 09:30:24 -0400 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2015-04-09 09:49:06 -0400 |
| commit | 7923a1a2c5354ada079d411da488f563c208b167 (patch) | |
| tree | 429ffae266369918c3519b8cf26a7c0478fe9330 | |
| parent | 8d703c459e7693bd42a5a0a16d50b40af5b8a6ed (diff) | |
| download | ansible-7923a1a2c5354ada079d411da488f563c208b167.tar.gz | |
Improve generation of debian changelog
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | packaging/debian/changelog | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -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 diff --git a/packaging/debian/changelog b/packaging/debian/changelog index dbd2bc24b4..34708e14dc 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low + + * %VERSION% release + + -- Ansible, Inc. <support@ansible.com> %DATE% + ansible (1.9.0.1) unstable; urgency=low * 1.9.0.1 |