From 0ab5d773d4fd824cf7c5f6ee3fec5c5cbb0175e5 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 5 Nov 2015 22:30:46 -0500 Subject: [PATCH 1/2] Update changelogs for 5.1.1 --- Changelog.md | 11 ++++++++++- debian/changelog | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2625e946724c1..c0f6952c8c7aa 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,11 +1,20 @@ -### Version 5.1.1 (2015-11-02) +### Version 5.1.1 (2015-11-06) 1. Add bullet dependency to package.xml * [Pull request #523](https://github.com/dartsim/dart/pull/523) +1. Improved handling of missing symbols of Assimp package + * [Pull request #542](https://github.com/dartsim/dart/pull/542) + 1. Improved travis-ci build log for Mac * [Pull request #529](https://github.com/dartsim/dart/pull/529) +1. Fixed warnings in Function.cpp + * [Pull request #550](https://github.com/dartsim/dart/pull/550) + +1. Fixed build failures on AppVeyor + * [Pull request #543](https://github.com/dartsim/dart/pull/543) + 1. Fixed const qualification of ResourceRetriever * [Pull request #534](https://github.com/dartsim/dart/pull/534) * [Issue #532](https://github.com/dartsim/dart/issues/532) diff --git a/debian/changelog b/debian/changelog index 1a2ad08973ed7..02b9cfe984ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ dart (5.1.1) unstable; urgency=medium * Add bullet dependency to package.xml + * Improved handling of missing symbols of Assimp package * Improved travis-ci build log for Mac + * Fixed warnings in Function.cpp + * Fixed build failures on AppVeyor * Fixed const qualification of ResourceRetriever * Fixed aligned memory allocation with Eigen objects * Fixed copy safety for various classes - -- Jeongseok Lee Mon, 02 Nov 2015 00:00:00 -0500 + -- Jeongseok Lee Mon, 06 Nov 2015 00:00:00 -0500 dart (5.1.0) unstable; urgency=medium From b961d29cbce2bf7231c0cd2612146a47885215fe Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 5 Nov 2015 22:34:30 -0500 Subject: [PATCH 2/2] Update control file for Debian packaging --- debian/control | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 3938bf469407d..5f94f1a88134c 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,9 @@ Build-Depends: debhelper (>= 9), liburdfdom-dev, libboost-dev (>= 1.54.0.1ubuntu1), libboost-system-dev (>= 1.54.0-4ubuntu3), - libboost-regex-dev (>= 1.54.0-4ubuntu3) + libboost-regex-dev (>= 1.54.0-4ubuntu3), + libopenthreads-dev, + libopenscenegraph-dev Standards-Version: 3.9.6 Section: libs Homepage: http://dartsim.github.io/ @@ -25,14 +27,14 @@ Vcs-Browser: https://github.com/dartsim/dart Package: libdart-core5-dev Section: libdevel Architecture: any -Pre-Depends: multiarch-support +Pre-Depends: ${misc:Pre-Depends} Conflicts: libdart-core3-dev, libdart-core4-dev Depends: ${misc:Depends}, libdart-core5.1 (= ${binary:Version}), libeigen3-dev, libassimp-dev (>= 3), libfcl-dev, - libboost-dev (>= 1.54.0.1ubuntu1) + libboost-all-dev (>= 1.54.0.1ubuntu1) Description: Dynamic Animation and Robotics Toolkit, core development files DART is a collaborative, cross-platform, open source library created by the Georgia Tech Graphics Lab and Humanoid Robotics Lab. The library provides data @@ -60,14 +62,16 @@ Description: Dynamic Animation and Robotics Toolkit, core development files Package: libdart5-dev Section: libdevel Architecture: any -Pre-Depends: multiarch-support +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libdart-core5-dev, libdart5.1 (= ${binary:Version}), freeglut3-dev, libxi-dev, libxmu-dev, - libtinyxml2-dev + libtinyxml2-dev, + libopenthreads-dev, + libopenscenegraph-dev Description: Dynamic Animation and Robotics Toolkit, development files DART is a collaborative, cross-platform, open source library created by the Georgia Tech Graphics Lab and Humanoid Robotics Lab. The library provides data @@ -96,7 +100,7 @@ Description: Dynamic Animation and Robotics Toolkit, development files Package: libdart-core5.1 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 @@ -126,7 +130,7 @@ Description: Dynamic Animation and Robotics Toolkit, core library files Package: libdart5.1 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