diff options
| author | James Laska <jlaska@ansible.com> | 2015-04-09 09:30:24 -0400 |
|---|---|---|
| committer | James Laska <jlaska@ansible.com> | 2015-04-09 09:30:56 -0400 |
| commit | bbc05a2cf5d0c72c51f62d28b4565f6da2796c1d (patch) | |
| tree | dc5710f0538fe882ec5c3a45e988a2cb04a5faeb | |
| parent | 1e7f7bfc12b6bf5e87a109dbe13c629f0a62b395 (diff) | |
| download | ansible-bbc05a2cf5d0c72c51f62d28b4565f6da2796c1d.tar.gz | |
Improve generation of debian changelog
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | packaging/debian/changelog | 7 |
2 files changed, 6 insertions, 4 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 aa03e724d0..84bf7e7703 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -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 |