[avce00] 01/01: Merge changelogs for git versions -3 and -4

[Johan Van de Wauw]

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository avce00.

commit 3924566b2160ae7074f29b4368b0a1c01e7fcf4e
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Tue Oct 21 17:23:03 2014 +0200

    Merge changelogs for git versions -3 and -4
---
 debian/changelog | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8ca805..9e685f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-avce00 (2.0.0-5) unstable; urgency=medium
+avce00 (2.0.0-3) unstable; urgency=medium
 
+  [ Johan Van de Wauw ]
   * Move to debhelper 9
   * Enable hardening when compiling/linking
   * Bump standards version, fix vcs links (cme fix dpkg-control)
@@ -7,10 +8,11 @@ avce00 (2.0.0-5) unstable; urgency=medium
   * Add doc-base
   * Add myself to uploaders
 
- -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Wed, 15 Oct 2014 21:15:24 +0200
-
-avce00 (2.0.0-4) unstable; urgency=low
-
+  [ Francesco Paolo Lovergine ]
+  * Fixed short and long descriptions to make lintian happy.
+  * Policy bumped to 3.8.3.
+  * Debhelper level set to 7. Now using dh_prep.
+  * Removed Jean-Denis Giguere among Uploaders.
   * Moved to source format 3.0
   * Repository moved to git and Vcs-* changed in debian/control.
   * Debhelper level set to 8. No changes required.
@@ -19,16 +21,7 @@ avce00 (2.0.0-4) unstable; urgency=low
   * Make lintian happy about debian-rules-ignores-make-clean-error.
   * Fixed extended-description-line-too-long lintian warning.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 22 Feb 2011 15:13:11 +0100
-
-avce00 (2.0.0-3) unstable; urgency=low
-
-  * Fixed short and long descriptions to make lintian happy.
-  * Policy bumped to 3.8.3.
-  * Debhelper level set to 7. Now using dh_prep.
-  * Removed Jean-Denis Giguere among Uploaders.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 21 Mar 2009 19:26:35 +0100
+ -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Tue, 21 Oct 2014 17:22:35 +0200
 
 avce00 (2.0.0-2) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/avce00.git