From 22e9b91fed1425ce2198400822d1e4b95f751343 Mon Sep 17 00:00:00 2001
From: Ian McMahon <imcmahon@rethinkrobotics.com>
Date: Mon, 1 Dec 2014 17:04:44 -0500
Subject: [PATCH] Version bump to 1.1 & default baxter.sh to indigo

---
 CHANGELOG.rst          |  4 ++++
 baxter.sh              | 29 ++---------------------------
 baxter_sdk/package.xml |  2 +-
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d003785..34feeb4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+1.1.0 (2014-12-1)
+---------------------------------
+- Updates baxter.sh to default to indigo ROS version
+
 1.0.0 (2014-5-1)
 ---------------------------------
 - Updates rosinstall to use https repo checkouts (no SSH keys required)
diff --git a/baxter.sh b/baxter.sh
index 0525d1c..20e5205 100755
--- a/baxter.sh
+++ b/baxter.sh
@@ -1,31 +1,6 @@
 #!/bin/bash
-
 # Copyright (c) 2013-2014, Rethink Robotics
 # All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of the Rethink Robotics nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 # This file is to be used in the *root* of your Catkin workspace.
 
@@ -51,8 +26,8 @@ baxter_hostname="baxter_hostname.local"
 your_ip="192.168.XXX.XXX"
 #your_hostname="my_computer.local"
 
-# Specify ROS distribution (e.g. groovy, hydro)
-ros_version="groovy"
+# Specify ROS distribution (e.g. indigo, hydro, etc.)
+ros_version="indigo"
 #-----------------------------------------------------------------------------#
 
 tf=$(tempfile)
diff --git a/baxter_sdk/package.xml b/baxter_sdk/package.xml
index 44762e2..e3620cc 100644
--- a/baxter_sdk/package.xml
+++ b/baxter_sdk/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>baxter_sdk</name>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <description>
     baxter_sdk metapackage containing all of the SDK packages
     for the Baxter Research Robot from Rethink Robotics.