[ros-vision-opencv] 03/07: Dropped opencv-apps. Upstream move it to another package

Sun Oct 23 17:40:58 UTC 2016

This is an automated email from the git hooks/post-receive script.

lepalom-guest pushed a commit to branch master
in repository ros-vision-opencv.

commit 6a33be672e464414a4780f31f5e55d105e19ec8e
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Sun Oct 23 18:00:45 2016 +0200

    Dropped opencv-apps. Upstream move it to another package
---
 debian/cl-opencv-apps.install                      |  1 -
 debian/control                                     | 37 ----------------------
 debian/libopencv-apps-dev.install                  |  4 ---
 debian/libopencv-apps0d.install                    |  1 -
 debian/opencv-apps-tools.install                   |  1 -
 debian/patches/0001-Add-CMakeLists.txt.patch       |  3 +-
 .../0002-Add-Debian-specific-SOVERSION.patch       | 17 ++--------
 7 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/debian/cl-opencv-apps.install b/debian/cl-opencv-apps.install
deleted file mode 100644
index 78ae9f4..0000000
--- a/debian/cl-opencv-apps.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/common-lisp/ros/opencv_apps
diff --git a/debian/control b/debian/control
index eca150b..b6f7f1d 100644
--- a/debian/control
+++ b/debian/control
@@ -78,40 +78,3 @@ Description: image_geometry Robot OS package - Python bindings
  .
  This package contains the Python interface.
 
-Package: libopencv-apps-dev
-Section: libdevel
-Architecture: any
-Depends: libopencv-apps0d (= ${binary:Version}), ${misc:Depends}, libcv-bridge-dev, libdynamic-reconfigure-config-init-mutex-dev, ros-message-generation, libimage-transport-dev, libnodeletlib-dev, libroscpp-dev
-Description: opencv_apps Robot OS package - development files
- This package is part of Robot OS (ROS). It contains development
- headers for a library for the opencv_apps library.
-
-Package: libopencv-apps0d
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
-Description: opencv_apps Robot OS package - runtime files
- This package is part of Robot OS (ROS). It contains the opencv_apps library.
-
-Package: opencv-apps-tools
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: opencv_apps Robot OS package - tools
- This package is part of Robot OS (ROS). It contains the opencv_apps tools
- that uses the libopencv-apps0d library.
-
-Package: python-opencv-apps
-Section: python
-Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-genpy, python-std-msgs
-Description: opencv_apps Robot OS package - Python bindings
- This package is part of Robot OS (ROS). It contains the Python bindings for
- the opencv_apps library.
-
-Package: cl-opencv-apps
-Section: lisp
-Architecture: all
-Depends: ${misc:Depends}
-Description: opencv_apps Robot OS package - LISP bindings
- This package is part of Robot OS (ROS). It contains the LISP bindings for
- the opencv_apps library.
diff --git a/debian/libopencv-apps-dev.install b/debian/libopencv-apps-dev.install
deleted file mode 100644
index baef5fd..0000000
--- a/debian/libopencv-apps-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/opencv_apps
-usr/lib/*/libopencv_apps.so
-usr/lib/*/pkgconfig/opencv_apps.pc
-usr/share/opencv_apps
diff --git a/debian/libopencv-apps0d.install b/debian/libopencv-apps0d.install
deleted file mode 100644
index 2596548..0000000
--- a/debian/libopencv-apps0d.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libopencv_apps.so.*
diff --git a/debian/opencv-apps-tools.install b/debian/opencv-apps-tools.install
deleted file mode 100644
index 6b70f3b..0000000
--- a/debian/opencv-apps-tools.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/opencv_apps
\ No newline at end of file
diff --git a/debian/patches/0001-Add-CMakeLists.txt.patch b/debian/patches/0001-Add-CMakeLists.txt.patch
index 47f209e..7a18f02 100644
--- a/debian/patches/0001-Add-CMakeLists.txt.patch
+++ b/debian/patches/0001-Add-CMakeLists.txt.patch
@@ -12,11 +12,10 @@ new file mode 100644
 index 0000000..ac2897b
 --- /dev/null
 +++ b/CMakeLists.txt
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,6 @@
 +cmake_minimum_required(VERSION 2.8.3)
 +project(vision_opencv)
 +
 +add_subdirectory(cv_bridge)
 +add_subdirectory(image_geometry)
-+add_subdirectory(opencv_apps)
 +add_subdirectory(opencv_tests)
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index fd85e49..c249844 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -5,8 +5,7 @@ Subject: Add Debian specific SOVERSION
 ---
  cv_bridge/src/CMakeLists.txt  | 1 +
  image_geometry/CMakeLists.txt | 1 +
- opencv_apps/CMakeLists.txt    | 1 +
- 3 files changed, 3 insertions(+)
+ 2 files changed, 2 insertions(+)
 
 diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt
 index 8ec321c..79e532f 100644
@@ -21,7 +20,7 @@ index 8ec321c..79e532f 100644
  install(TARGETS ${PROJECT_NAME} DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
  
 diff --git a/image_geometry/CMakeLists.txt b/image_geometry/CMakeLists.txt
-index 3c9cb30..b89b28e 100644
+index e7c9eea..9336052 100644
 --- a/image_geometry/CMakeLists.txt
 +++ b/image_geometry/CMakeLists.txt
 @@ -20,6 +20,7 @@ include_directories(include)
@@ -32,15 +31,3 @@ index 3c9cb30..b89b28e 100644
  add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
  
  install(DIRECTORY include/${PROJECT_NAME}/
-diff --git a/opencv_apps/CMakeLists.txt b/opencv_apps/CMakeLists.txt
-index 79865da..9a7e569 100644
---- a/opencv_apps/CMakeLists.txt
-+++ b/opencv_apps/CMakeLists.txt
-@@ -186,6 +186,7 @@ add_library(${PROJECT_NAME} SHARED
- )
- 
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
-+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${opencv_apps_VERSION} SOVERSION "0d")
- add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencfg ${PROJECT_NAME}_generate_messages_cpp)
- install(TARGETS ${PROJECT_NAME}
-         DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-vision-opencv.git

