From 9e5ca838eb7fe2ef933dc5c5f765064298ad24ed Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <w.merkt@gmail.com>
Date: Tue, 30 Mar 2021 17:31:54 +0100
Subject: [PATCH] Fix rosdep keys

---
 aslam_cv/aslam_cameras/package.xml                         | 1 -
 aslam_cv/aslam_cv_backend/package.xml                      | 2 --
 aslam_cv/aslam_cv_backend_python/package.xml               | 3 ---
 aslam_cv/aslam_cv_python/package.xml                       | 7 -------
 aslam_cv/aslam_cv_serialization/package.xml                | 3 ---
 aslam_cv/aslam_imgproc/package.xml                         | 3 ---
 .../incremental_calibration/package.xml                    | 2 +-
 aslam_nonparametric_estimation/aslam_splines/package.xml   | 1 -
 .../aslam_splines_python/package.xml                       | 1 -
 aslam_nonparametric_estimation/bsplines/package.xml        | 1 -
 aslam_nonparametric_estimation/bsplines_python/package.xml | 1 -
 aslam_offline_calibration/ethz_apriltag2/package.xml       | 2 +-
 aslam_offline_calibration/kalibr/package.xml               | 5 +----
 aslam_optimizer/aslam_backend/package.xml                  | 7 ++-----
 aslam_optimizer/aslam_backend_python/package.xml           | 1 -
 aslam_optimizer/sparse_block_matrix/package.xml            | 3 +--
 opencv2_catkin/package.xml                                 | 2 +-
 suitesparse/package.xml                                    | 4 ++--
 18 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/aslam_cv/aslam_cameras/package.xml b/aslam_cv/aslam_cameras/package.xml
index f58bc6942..954702f5c 100644
--- a/aslam_cv/aslam_cameras/package.xml
+++ b/aslam_cv/aslam_cameras/package.xml
@@ -20,7 +20,6 @@ email="paul.furgale@mavt.ethz.ch">Paul Furgale</maintainer>
   <build_depend>sm_opencv</build_depend>
   <build_depend>sm_property_tree</build_depend>
   <build_depend>opencv2_catkin</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>sm_random</build_depend>
 </package>
 
diff --git a/aslam_cv/aslam_cv_backend/package.xml b/aslam_cv/aslam_cv_backend/package.xml
index 3e2e87ed5..b43d28183 100644
--- a/aslam_cv/aslam_cv_backend/package.xml
+++ b/aslam_cv/aslam_cv_backend/package.xml
@@ -19,12 +19,10 @@
   <build_depend>sm_timing</build_depend>
 
   <build_depend>aslam_backend</build_depend>
-  <build_depend>aslam_camera_system</build_depend>
   <build_depend>aslam_backend_expressions</build_depend>
   <build_depend>aslam_time</build_depend>
   <build_depend>aslam_cameras</build_depend>
 
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>opencv2_catkin</build_depend>
   <build_depend>suitesparse</build_depend>
   <build_depend>sparse_block_matrix</build_depend>
diff --git a/aslam_cv/aslam_cv_backend_python/package.xml b/aslam_cv/aslam_cv_backend_python/package.xml
index 9b6df1b7a..4cd3a5cf0 100644
--- a/aslam_cv/aslam_cv_backend_python/package.xml
+++ b/aslam_cv/aslam_cv_backend_python/package.xml
@@ -21,11 +21,8 @@
   <build_depend>aslam_backend</build_depend>
   <build_depend>aslam_backend_expressions</build_depend>
   <build_depend>aslam_backend_python</build_depend>
-  <build_depend>aslam_features2d</build_depend>
   <build_depend>opencv2_catkin</build_depend>
   <build_depend>aslam_cameras</build_depend>
-  <build_depend>aslam_camera_system</build_depend>
-  <build_depend>aslam_frames</build_depend>
   <build_depend>aslam_cv_error_terms</build_depend>
   <build_depend>aslam_splines</build_depend>
   <build_depend>aslam_cv_python</build_depend>
diff --git a/aslam_cv/aslam_cv_python/package.xml b/aslam_cv/aslam_cv_python/package.xml
index c178fbabe..af696cea4 100644
--- a/aslam_cv/aslam_cv_python/package.xml
+++ b/aslam_cv/aslam_cv_python/package.xml
@@ -17,16 +17,9 @@
 
     <build_depend>python_module</build_depend>
 
-    <build_depend>brisk</build_depend>
-
     <build_depend>aslam_cv_serialization</build_depend>
     <build_depend>aslam_imgproc</build_depend>
     <build_depend>aslam_cameras</build_depend>
     <build_depend>aslam_time</build_depend>
-    <build_depend>aslam_features2d</build_depend>
-    <build_depend>aslam_camera_system</build_depend>
-    <build_depend>aslam_matcher</build_depend>
     <build_depend>aslam_cv_serialization</build_depend>
-
-    <build_depend>eigen_catkin</build_depend>
 </package>
diff --git a/aslam_cv/aslam_cv_serialization/package.xml b/aslam_cv/aslam_cv_serialization/package.xml
index d56c81e1e..7b307a7bf 100644
--- a/aslam_cv/aslam_cv_serialization/package.xml
+++ b/aslam_cv/aslam_cv_serialization/package.xml
@@ -9,9 +9,6 @@
     <buildtool_depend>catkin_simple</buildtool_depend>
 
     <build_depend>aslam_cameras</build_depend>
-    <build_depend>aslam_frames</build_depend>
-    <build_depend>aslam_features2d</build_depend>
-    <build_depend>aslam_camera_system</build_depend>
     <build_depend>aslam_time</build_depend>
 
     <build_depend>sm_common</build_depend>
diff --git a/aslam_cv/aslam_imgproc/package.xml b/aslam_cv/aslam_imgproc/package.xml
index c4d09a9c8..6a7d99e02 100644
--- a/aslam_cv/aslam_imgproc/package.xml
+++ b/aslam_cv/aslam_imgproc/package.xml
@@ -12,7 +12,6 @@
   <!-- List dependencies to system libs and other catkin packages here. -->
   <build_depend>sm_common</build_depend>
 
-  <build_depend>sm_time</build_depend>
   <build_depend>sm_common</build_depend>
   <build_depend>sm_eigen</build_depend>
   <build_depend>sm_random</build_depend>
@@ -23,9 +22,7 @@
   <build_depend>sm_property_tree</build_depend>
   <build_depend>aslam_time</build_depend>
   <build_depend>aslam_cameras</build_depend>
-  <build_depend>aslam_frames</build_depend>
   <build_depend>opencv2_catkin</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>numpy_eigen</build_depend>
 
 
diff --git a/aslam_incremental_calibration/incremental_calibration/package.xml b/aslam_incremental_calibration/incremental_calibration/package.xml
index 6042b702d..b873ba6a2 100644
--- a/aslam_incremental_calibration/incremental_calibration/package.xml
+++ b/aslam_incremental_calibration/incremental_calibration/package.xml
@@ -16,7 +16,7 @@
   <build_depend>sm_eigen</build_depend>
   <build_depend>aslam_backend</build_depend>
   <build_depend>suitesparse</build_depend>
-  <build_depend>TBB</build_depend>
+  <build_depend>tbb</build_depend>
 
   <run_depend>sm_eigen</run_depend>
   <run_depend>aslam_backend</run_depend>
diff --git a/aslam_nonparametric_estimation/aslam_splines/package.xml b/aslam_nonparametric_estimation/aslam_splines/package.xml
index ff0d6f991..892e72d1a 100644
--- a/aslam_nonparametric_estimation/aslam_splines/package.xml
+++ b/aslam_nonparametric_estimation/aslam_splines/package.xml
@@ -15,7 +15,6 @@
   <build_depend>numpy_eigen</build_depend>
   <build_depend>sparse_block_matrix</build_depend>
   <build_depend>suitesparse</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>sm_common</build_depend>
   <build_depend>sm_kinematics</build_depend>
   <build_depend>sm_timing</build_depend>
diff --git a/aslam_nonparametric_estimation/aslam_splines_python/package.xml b/aslam_nonparametric_estimation/aslam_splines_python/package.xml
index 0196a7fbc..477eea23c 100644
--- a/aslam_nonparametric_estimation/aslam_splines_python/package.xml
+++ b/aslam_nonparametric_estimation/aslam_splines_python/package.xml
@@ -14,7 +14,6 @@
   <build_depend>bsplines</build_depend>
   <build_depend>numpy_eigen</build_depend>
   <build_depend>python_module</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>sparse_block_matrix</build_depend>
   <build_depend>sm_common</build_depend>
   <build_depend>suitesparse</build_depend>
diff --git a/aslam_nonparametric_estimation/bsplines/package.xml b/aslam_nonparametric_estimation/bsplines/package.xml
index ae11fd246..86f68d650 100644
--- a/aslam_nonparametric_estimation/bsplines/package.xml
+++ b/aslam_nonparametric_estimation/bsplines/package.xml
@@ -14,7 +14,6 @@
   <build_depend>sm_eigen</build_depend>
   <build_depend>sm_kinematics</build_depend>
   <build_depend>sparse_block_matrix</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>suitesparse</build_depend>
 
 </package>
diff --git a/aslam_nonparametric_estimation/bsplines_python/package.xml b/aslam_nonparametric_estimation/bsplines_python/package.xml
index 24ccb9d70..5a629c134 100644
--- a/aslam_nonparametric_estimation/bsplines_python/package.xml
+++ b/aslam_nonparametric_estimation/bsplines_python/package.xml
@@ -12,7 +12,6 @@
   <build_depend>bsplines</build_depend>
   <build_depend>numpy_eigen</build_depend>
   <build_depend>python_module</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>sparse_block_matrix</build_depend>
   <build_depend>sm_common</build_depend>
   <build_depend>suitesparse</build_depend>
diff --git a/aslam_offline_calibration/ethz_apriltag2/package.xml b/aslam_offline_calibration/ethz_apriltag2/package.xml
index 0e190d077..780438a72 100644
--- a/aslam_offline_calibration/ethz_apriltag2/package.xml
+++ b/aslam_offline_calibration/ethz_apriltag2/package.xml
@@ -8,6 +8,6 @@
   <license>New BSD</license>
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>eigen</build_depend>
-  <build_depend>opencv</build_depend>
+  <build_depend>libopencv-dev</build_depend>
   <build_depend>libv4l-dev</build_depend>
 </package>
diff --git a/aslam_offline_calibration/kalibr/package.xml b/aslam_offline_calibration/kalibr/package.xml
index b0d7d74f0..ae9f15d36 100644
--- a/aslam_offline_calibration/kalibr/package.xml
+++ b/aslam_offline_calibration/kalibr/package.xml
@@ -16,16 +16,13 @@
   <build_depend>aslam_backend_python</build_depend>
   <build_depend>incremental_calibration_python</build_depend>
   <build_depend>aslam_cameras_april</build_depend>
-  <build_depend>aslam_cameras_april_python</build_depend>
   <build_depend>aslam_splines_python</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>numpy_eigen</build_depend>
   <build_depend>python_module</build_depend>
   <build_depend>sparse_block_matrix</build_depend>
   <build_depend>sm_python</build_depend>
   <build_depend>aslam_cv_backend_python</build_depend>
-       
-  <run_depend>aslam_cameras_april_python</run_depend>
+
   <run_depend>aslam_cv_backend_python</run_depend>
   <run_depend>aslam_backend_python</run_depend>
   <run_depend>incremental_calibration_python</run_depend>
diff --git a/aslam_optimizer/aslam_backend/package.xml b/aslam_optimizer/aslam_backend/package.xml
index 4a3e36ea3..994721a40 100644
--- a/aslam_optimizer/aslam_backend/package.xml
+++ b/aslam_optimizer/aslam_backend/package.xml
@@ -16,8 +16,7 @@
   <build_depend>sm_logging</build_depend>
   <build_depend>sm_property_tree</build_depend>
   <build_depend>suitesparse</build_depend>
-  <build_depend>TBB</build_depend>
-  <build_depend>asl_cmake_modules</build_depend>
+  <build_depend>tbb</build_depend>
 
   <run_depend>sparse_block_matrix</run_depend>
   <run_depend>sm_boost</run_depend>
@@ -25,7 +24,5 @@
   <run_depend>sm_timing</run_depend>
   <run_depend>sm_logging</run_depend>
   <run_depend>sm_property_tree</run_depend>
-  <run_depend>TBB</run_depend>
-  <run_depend>asl_cmake_modules</run_depend>
-
+  <run_depend>tbb</run_depend>
 </package>
diff --git a/aslam_optimizer/aslam_backend_python/package.xml b/aslam_optimizer/aslam_backend_python/package.xml
index 26d9d82f5..36bc3ad3e 100644
--- a/aslam_optimizer/aslam_backend_python/package.xml
+++ b/aslam_optimizer/aslam_backend_python/package.xml
@@ -13,7 +13,6 @@
   <build_depend>aslam_backend_expressions</build_depend>
   <build_depend>numpy_eigen</build_depend>
   <build_depend>python_module</build_depend>
-  <build_depend>eigen_catkin</build_depend>
   <build_depend>sparse_block_matrix</build_depend>
   <build_depend>sm_common</build_depend>
   <build_depend>sm_kinematics</build_depend>
diff --git a/aslam_optimizer/sparse_block_matrix/package.xml b/aslam_optimizer/sparse_block_matrix/package.xml
index b46b9bd48..8c38f86a2 100644
--- a/aslam_optimizer/sparse_block_matrix/package.xml
+++ b/aslam_optimizer/sparse_block_matrix/package.xml
@@ -9,8 +9,7 @@
   <buildtool_depend>catkin</buildtool_depend>
   <buildtool_depend>catkin_simple</buildtool_depend>
   
-  <build_depend>TBB</build_depend>
-  <build_depend>asl_cmake_modules</build_depend>
+  <build_depend>tbb</build_depend>
   <build_depend>sm_common</build_depend>
   <build_depend>sm_eigen</build_depend>
   <build_depend>suitesparse</build_depend>
diff --git a/opencv2_catkin/package.xml b/opencv2_catkin/package.xml
index f55657610..f00361734 100644
--- a/opencv2_catkin/package.xml
+++ b/opencv2_catkin/package.xml
@@ -10,5 +10,5 @@
   <buildtool_depend>catkin</buildtool_depend>
   <buildtool_depend>catkin_simple</buildtool_depend>
 
-  <build_depend>opencv2</build_depend>
+  <build_depend>libopencv-dev</build_depend>
 </package>
diff --git a/suitesparse/package.xml b/suitesparse/package.xml
index be73627e3..b35832c2d 100644
--- a/suitesparse/package.xml
+++ b/suitesparse/package.xml
@@ -11,8 +11,8 @@
   <author>Dr. Tim Davis</author>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>lapack</build_depend>
-  <build_depend>blas</build_depend>
+  <build_depend>liblapack-dev</build_depend>
+  <build_depend>libblas-dev</build_depend>
   <build_depend>gfortran</build_depend>
 
 </package>