[bullet] 05/05: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/bullet

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository bullet.

commit 6609f035242f451e1e96c0f669021c709b1ba13c
Merge: 2f35431 f15f4cd
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Aug 21 12:55:23 2015 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/bullet

 debian/changelog                                   | 10 +++
 debian/control                                     | 84 +++++++++++++---------
 ...83.install => libbulletcollision2.83v5.install} |  0
 ....83.install => libbulletdynamics2.83v5.install} |  0
 ...3.install => libbulletfileloader2.83v5.install} |  0
 ....83.install => libbulletsoftbody2.83v5.install} |  0
 ...nstall => libbulletworldimporter2.83v5.install} |  0
 ...all => libbulletxmlworldimporter2.83v5.install} |  0
 ...nstall => libconvexdecomposition2.83v5.install} |  0
 ...s2.83.install => libgimpactutils2.83v5.install} |  0
 .../{libhacd2.83.install => libhacd2.83v5.install} |  0
 ...ath2.83.install => liblinearmath2.83v5.install} |  0
 12 files changed, 62 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index c39c2b2,56dab3c..c35fabc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
 +bullet (2.83.6+dfsg-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Markus Koschany <apo at gambaru.de>  Mon, 17 Aug 2015 10:53:02 +0200
 +
+ bullet (2.83.5+dfsg-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Rename libraries for C++ ABI transition (Closes: #790988)
+   * Build-depend on a version of libtinyxml-dev that has started
+     the same transition
+   * Vcs-Browser: use https
+ 
+  -- Simon McVittie <smcv at debian.org>  Thu, 20 Aug 2015 09:08:45 +0100
+ 
  bullet (2.83.5+dfsg-1) unstable; urgency=medium
  
    * New upstream release.

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