[gazebo] 01/01: Join versions in d/changelog in one.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gazebo.

commit 844a7831455675842523c6d6d1cd878bcafedf6e
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Sep 24 20:51:50 2015 +0200

    Join versions in d/changelog in one.
    
    6.0.0+dfsg-1 was never uploaded into Debian.
    Also integrated NMU 5.0.1+dfsg-2.1 from Sebastian Ramacher
---
 debian/changelog | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 989026d..78bcbee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,17 +2,19 @@ gazebo (6.1.0+dfsg-1) unstable; urgency=medium
 
   * Migrate patch to use FindGtest from PCL lib
   * Imported Upstream version 6.1.0
+  * Removed patches merged upstream and update the reamining ones.
+  * Change all gazebo5 package references to gazebo6
+  * Added patch to use system gtest
 
  -- Jose Luis Rivero <jrivero at osrfoundation.org>  Mon, 31 Aug 2015 14:23:31 +0200
 
-gazebo (6.0.0+dfsg-1) unstable; urgency=medium
+gazebo (5.0.1+dfsg-2.1) unstable; urgency=medium
 
-  * Imported Upstream version 6.0.0
-  * Removed patches merged upstream and update the reamining ones.
-  * Change all gazebo5 package references to gazebo6
-  * Added patch to use system gtest
+  * Non-maintainer upload.
+  * debian/patches/0010-bullet-2.83.patch: Apply upstream patch to fix build
+    against bullet 2.83. (Closes: #792992)
 
- -- Jose Luis Rivero <jrivero at osrfoundation.org>  Thu, 30 Jul 2015 17:14:31 +0000
+ -- Sebastian Ramacher <sramacher at debian.org>  Mon, 27 Jul 2015 18:35:36 +0200
 
 gazebo (5.0.1+dfsg-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git