From f160a8dfdb4cdfa6ed062c0dbe1a00f3c4859b59 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 9 Jan 2016 07:18:47 -0500 Subject: [PATCH 1/4] Bump version to 4.3.5 and update changelogs --- CMakeLists.txt | 2 +- Changelog.md | 7 ++++++- debian/changelog | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2711b158192db..40e6188356306 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ project(dart) set(DART_MAJOR_VERSION "4") set(DART_MINOR_VERSION "3") -set(DART_PATCH_VERSION "4") +set(DART_PATCH_VERSION "5") set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSION}") set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.") set(DART_PKG_EXTERNAL_DEPS "flann, ccd, fcl") diff --git a/Changelog.md b/Changelog.md index 0751db0a1e59e..f0f7f1fb48e40 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,9 @@ -### Version 4.3.3 (2015-01-24) +### Version 4.3.5 (2015-01-24) + +1. Fixed incorrect applying of joint constraint impulses (backported from 6.0.0) + * [Pull request #578](https://github.com/dartsim/dart/pull/578) + +### Version 4.3.4 (2015-01-24) 1. Fixed build issue with gtest on Mac * [Pull request #315](https://github.com/dartsim/dart/pull/315) diff --git a/debian/changelog b/debian/changelog index 0ba3bd9f7301a..3fad01d89d8df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dart (4.3.5) unstable; urgency=medium + + * Fixed incorrect applying of joint constraint impulses (backported from 6.0.0) + + -- Jeongseok Lee Sat, 9 Jan 2015 12:00:00 -0500 + dart (4.3.4) unstable; urgency=low * Fixed build issue with gtest on Mac From 4f97999d7ffd1f53ef393af21a10693f838bd38b Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 9 Jan 2016 07:55:14 -0500 Subject: [PATCH 2/4] Suppress debian build warnings --- debian/control | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 3382a3b227dac..363bfc910c2d1 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: dart +Source: dart4 Priority: extra Maintainer: Jeongseok Lee Build-Depends: debhelper (>= 9), @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9), libtinyxml-dev, libtinyxml2-dev, liburdfdom-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Section: libs Homepage: http://dartsim.github.io/ Vcs-Git: git://github.com/dartsim/dart.git @@ -22,7 +22,7 @@ Vcs-Browser: https://github.com/dartsim/dart Package: libdart-core4-dev Section: libdevel Architecture: any -Pre-Depends: multiarch-support +Pre-Depends: ${misc:Pre-Depends} Conflicts: libdart-core3-dev Depends: ${misc:Depends}, libdart-core4.3 (= ${binary:Version}), @@ -56,7 +56,7 @@ Description: Dynamic Animation and Robotics Toolkit, core development files Package: libdart4-dev Section: libdevel Architecture: any -Pre-Depends: multiarch-support +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libdart-core4-dev, libdart4.3 (= ${binary:Version}), @@ -92,7 +92,7 @@ Description: Dynamic Animation and Robotics Toolkit, development files Package: libdart-core4.3 Section: libs Architecture: any -Pre-Depends: multiarch-support +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Dynamic Animation and Robotics Toolkit, core library files @@ -122,7 +122,7 @@ Description: Dynamic Animation and Robotics Toolkit, core library files Package: libdart4.3 Section: libs Architecture: any -Pre-Depends: multiarch-support +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Dynamic Animation and Robotics Toolkit, library files From 214c93e34c90beb15d90d55cc47c4e6b5dfa9749 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 9 Jan 2016 07:55:54 -0500 Subject: [PATCH 3/4] Add version number to the package name in debian build --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3fad01d89d8df..2e51442ecc43a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dart (4.3.5) unstable; urgency=medium +dart4 (4.3.5) unstable; urgency=medium * Fixed incorrect applying of joint constraint impulses (backported from 6.0.0) From 5f9a0264a0cd87490012a6eef63c4a33083c5253 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 9 Jan 2016 08:15:09 -0500 Subject: [PATCH 4/4] Fix release date of DART 4.3.5 in Changelog.md --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index f0f7f1fb48e40..4b1ecb63f7eb3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,4 @@ -### Version 4.3.5 (2015-01-24) +### Version 4.3.5 (2016-01-09) 1. Fixed incorrect applying of joint constraint impulses (backported from 6.0.0) * [Pull request #578](https://github.com/dartsim/dart/pull/578)