diff -Nru gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/Changelog.md gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/Changelog.md --- gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/Changelog.md 2015-09-26 15:16:23.000000000 +0000 +++ gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/Changelog.md 2015-09-29 15:16:36.000000000 +0000 @@ -3,6 +3,10 @@ 1. Update physics when the world is reset * [Pull request #1903](https://bitbucket.org/osrf/gazebo/pull-request/1903) +1. Resolve issue #1702 + * [Issue #1702](https://bitbucket.org/osrf/gazebo/issue/1702) + * [Pull request #1905](https://bitbucket.org/osrf/gazebo/pull-request/1905) + 1. Rename Reset to Reset Time in time widget * [Pull request #1892](https://bitbucket.org/osrf/gazebo/pull-request/1892) * [Issue #1730](https://bitbucket.org/osrf/gazebo/issue/1730) diff -Nru gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/debian/bzr-builder.manifest gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/debian/bzr-builder.manifest --- gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/debian/bzr-builder.manifest 2015-09-26 15:16:30.000000000 +0000 +++ gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/debian/bzr-builder.manifest 2015-09-29 15:16:43.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}+20150926+4+7 -lp:~hrg/hrg-packaging/gazebo-mirror revid:yosuke.matsusaka@gmail.com-20150926150052-pjhfy42cv82h1wkc +# bzr-builder format 0.3 deb-version {debupstream}+20150929+5+7 +lp:~hrg/hrg-packaging/gazebo-mirror revid:yosuke.matsusaka@gmail.com-20150929150053-ze3mg3yk76x27m7y nest-part packaging lp:~hrg/hrg-packaging/libgazebo-ode-static-dev-deb-precise debian debian revid:yosuke.matsusaka@gmail.com-20150922223726-ssya1b1ky86nr756 diff -Nru gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/debian/changelog gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/debian/changelog --- gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/debian/changelog 2015-09-26 15:16:30.000000000 +0000 +++ gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/debian/changelog 2015-09-29 15:16:43.000000000 +0000 @@ -1,8 +1,8 @@ -gazebo (7.0.0+20150926+4+7~ubuntu12.04.1) precise; urgency=low +gazebo (7.0.0+20150929+5+7~ubuntu12.04.1) precise; urgency=low * Auto build. - -- Launchpad Package Builder Sat, 26 Sep 2015 15:16:30 +0000 + -- Launchpad Package Builder Tue, 29 Sep 2015 15:16:43 +0000 gazebo (7.0.0) UNRELEASED; urgency=medium diff -Nru gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.cc gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.cc --- gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.cc 2015-09-26 15:16:23.000000000 +0000 +++ gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.cc 2015-09-29 15:16:36.000000000 +0000 @@ -32,15 +32,15 @@ static const float PITCH_LIMIT_HIGH = M_PI*0.5 - 0.001; ////////////////////////////////////////////////// -OrbitViewController::OrbitViewController(UserCameraPtr _camera) +OrbitViewController::OrbitViewController(UserCameraPtr _camera, + const std::string &_name) : ViewController(_camera), distance(5.0f) { this->typeString = TYPE_STRING; this->init = false; // Create a visual that is used a reference point. - this->refVisual.reset(new Visual("OrbitViewController", - this->camera->GetScene())); + this->refVisual.reset(new Visual(_name, this->camera->GetScene())); this->refVisual->Load(); this->refVisual->AttachMesh("unit_sphere"); diff -Nru gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.hh gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.hh --- gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.hh 2015-09-26 15:16:23.000000000 +0000 +++ gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/gazebo/rendering/OrbitViewController.hh 2015-09-29 15:16:36.000000000 +0000 @@ -37,7 +37,11 @@ { /// \brief Constructor. /// \param[in] _camera Pointer to the camera to control. - public: OrbitViewController(UserCameraPtr _camera); + /// \param[in] _name Name of the view controller. A subclass of + /// OrbitViewController should use a name other than + /// "OrbitViewController". + public: OrbitViewController(UserCameraPtr _camera, + const std::string &_name = "OrbitViewController"); /// \brief Destructor. public: virtual ~OrbitViewController(); diff -Nru gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/gazebo/rendering/OrthoViewController.cc gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/gazebo/rendering/OrthoViewController.cc --- gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/gazebo/rendering/OrthoViewController.cc 2015-09-26 15:16:23.000000000 +0000 +++ gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/gazebo/rendering/OrthoViewController.cc 2015-09-29 15:16:36.000000000 +0000 @@ -32,7 +32,8 @@ ////////////////////////////////////////////////// OrthoViewController::OrthoViewController(UserCameraPtr _camera) - : OrbitViewController(_camera), dataPtr(new OrthoViewControllerPrivate) + : OrbitViewController(_camera, "OrthoViewController"), + dataPtr(new OrthoViewControllerPrivate) { this->typeString = TYPE_STRING; this->init = false; diff -Nru gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/Migration.md gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/Migration.md --- gazebo-7.0.0+20150926+4+7~ubuntu12.04.1/Migration.md 2015-09-26 15:16:23.000000000 +0000 +++ gazebo-7.0.0+20150929+5+7~ubuntu12.04.1/Migration.md 2015-09-29 15:16:36.000000000 +0000 @@ -9,6 +9,10 @@ ### Modifications +1. **gazebo/rendering/OribitViewController.hh** + + ***Removed:*** public: OrbitViewController(UserCameraPtr _camera); + + ***Replacement:*** public: OrbitViewController(UserCameraPtr _camera, const std::string &_name = "OrbitViewController"); + 1. **gazebo/test/ServerFixture.hh** + ***Removed:*** protected: void RunServer(const std::string &_worldFilename); + ***Removed:*** protected: void RunServer(const std::string &_worldFilename,