From bbc05a2cf5d0c72c51f62d28b4565f6da2796c1d Mon Sep 17 00:00:00 2001
From: James Laska <jlaska@ansible.com>
Date: Thu, 9 Apr 2015 09:30:24 -0400
Subject: Improve generation of debian changelog

---
 packaging/debian/changelog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'packaging')

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
 
-- 
cgit v1.2.3