diff --git a/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index 2d7346e33dfb4bfe5519f99f3592406018009350..f8e59c349d9aeca9772943077faf1ab7002d2fe1 100644
--- a/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 16:00:25 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+Upstream-Status: Backport [Accepted in indigo-devel branch]
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch b/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch
index a69f576b8d8c13666b76ac076321dcfb0cec7459..07d712732b324284f0587bb2b892e2573925176e 100644
--- a/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch
+++ b/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch
@@ -3,6 +3,8 @@ From: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Date: Wed, 13 Mar 2013 11:49:17 +0100
Subject: [PATCH] CATKIN_WORKSPACES: Don't require .catkin file
+Upstream-Status: Inappropriate [only for our setup]
+
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
---
cmake/all.cmake | 8 +++-----
diff --git a/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch b/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch
index 99b5cbf9d1626911eb5db98fdbe02bb4862b076b..5a57efc689a9039ef3807679f75a0668ab36a490 100644
--- a/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch
+++ b/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch
@@ -5,6 +5,8 @@ Subject: [PATCH] Fix the path added to CMAKE_MODULE_PATH.
@CMAKE_INSTALL_PREFIX@/@CATKIN_PACKAGE_SHARE_DESTINATION@ have been
replaced with "${cmake_modules_DIR}/.." to make the module work.
+
+Upstream-Status: Pending
---
cmake/cmake_modules-extras.cmake.installspace.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch
index 1eb5f1c47cb6cc8dd05ff21a86c4c236b5274915..e496bc47e5dc4530029f9b802b8cd38b4b89cef4 100644
--- a/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch
+++ b/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Wed, 22 Jan 2014 11:18:25 +0100
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+Upstream-Status: Accepted
---
CMakeLists.txt | 8 +++++---
package.xml | 2 +-
diff --git a/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch
index d3de21e0a2a697674a09baf11d1fd71cf1c8aa55..d1cd8ff0844300642d740feeb6511613b94d2d3d 100644
--- a/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch
+++ b/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 12 Oct 2013 11:39:36 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+Upstream-Status: Accepted
---
CMakeLists.txt | 64 +++++++++++++++++++++++++++++++---------------------------
package.xml | 2 +-
diff --git a/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index 3674f223056bf369b369a4bda3b1e48182b7bd81..7d46d064d4b50052efc8f41f8c2c651d80a44f24 100644
--- a/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 16:02:09 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+Upstream-Status: Accepted
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch
index 73080d0a0771b03add173019d9ef8d68b4833a1c..b0fbc07354955e90e7632fbca348f9548a078141 100644
--- a/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch
+++ b/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Mon, 15 Jul 2013 14:04:43 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+Upstream-Status: Accepted
---
angles/CMakeLists.txt | 4 +++-
angles/package.xml | 2 +-
diff --git a/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index fac20da939f9052673b2623a95d19ce7f2da5f87..3862a240aae2a1e36c27dbe492542438a17590ed 100644
--- a/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 16:02:48 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+Upstream-Status: Backport [Accepted in indigo-devel branch]
---
tf/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index 7b4b5aad7f2f59362609bf33fc042762fc8987f3..d3c12d13278fdbcd11a7886070c4b8c4231107ac 100644
--- a/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 16:04:23 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+Upstream-Status: Accepted
---
camera_info_manager/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index 4cdfc309f7c9ec0aa4f037f6c59aacee7a6c8c0e..7adbd4a8146c11c8270577d55b809ab6572f2555 100644
--- a/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 16:05:31 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+Upstream-Status: Submitted
---
map_server/CMakeLists.txt | 2 +-
robot_pose_ekf/CMakeLists.txt | 3 ++-
diff --git a/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index ad9fcc949b65edc0f7137846f36a3befe1bd5861..45ab73d3a86db8fdf7f743aa13bb78c8ca9dca90 100644
--- a/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,10 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 12:57:23 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+This patch includes the subsequent fix in the indigo-devel branch of the
+ros_comm repository (commit "fix find_package() call with two package names").
+
+Upstream-Status: Backport [Accepted in indigo-devel branch]
---
tools/rosnode/CMakeLists.txt | 3 ++-
tools/rostopic/CMakeLists.txt | 3 ++-
@@ -62,7 +66,8 @@ index e441b9a..2d52451 100644
#Testing
if(CATKIN_ENABLE_TESTING)
-+ find_package(rostest rosunit)
++ find_package(rostest)
++ find_package(rosunit)
catkin_add_gtest(${PROJECT_NAME}-utest test/utest.cpp)
if(TARGET ${PROJECT_NAME}-utest)
target_link_libraries(${PROJECT_NAME}-utest topic_tools)
diff --git a/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch
index a9a7438d257f18fe781243ef90e35b866fce3eda..ed7bad72add1f3e854e535f2a04e5525018ebb5d 100644
--- a/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch
+++ b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch
@@ -6,6 +6,8 @@ Subject: Increase start and stop timeouts for ROS master.
Certain boards are too slow to boot up the ROS master before roscore gives up.
This patch increases the start and stop timeouts, giving the ROS master more
time to start.
+
+Upstream-Status: Inappropriate [embedded specific]
---
src/roslaunch/launch.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index a3dda3341c3c3d111befb739e35047811352b674..b2fb5eacb17c5532468c3e4c2da3e826944c7101 100644
--- a/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 16:06:33 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+Upstream-Status: Submitted
---
controller_manager_tests/CMakeLists.txt | 3 ++-
joint_limits_interface/CMakeLists.txt | 3 ++-
diff --git a/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch
index 5f88b47aff581dd4a246e9d677983e56e5784614..e960a887057d6b56fd367467d1e85811ae1efab2 100644
--- a/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch
+++ b/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Thu, 10 Apr 2014 07:31:32 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+Upstream-Status: Submitted
---
joint_trajectory_controller/CMakeLists.txt | 44 ++++++++++++++++--------------
joint_trajectory_controller/package.xml | 2 +-
diff --git a/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index 6b7f63c192224bf4b04b0748300e427d1ef2896c..2789f3d6666460b40bce7784b77e00c90a3f77a1 100644
--- a/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue, 4 Feb 2014 16:07:10 +0100
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+Upstream-Status: Submitted
---
rospy_tutorials/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
index 891bbfc58e1c21835fad869240faa561a5b8fa97..de44af7a3baf1b70e36c5cdbb0b90acb3c8d7ae7 100644
--- a/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
+++ b/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
@@ -3,6 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 12 Oct 2013 11:14:26 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+Upstream-Status: Accepted
---
CMakeLists.txt | 6 ++++--
package.xml | 2 +-