[ros-rosconsole-bridge] 02/04: Remove patch applied upstream

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-rosconsole-bridge.

commit bf2e9326a462a542f062dc610565446979b0d74e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jul 10 10:11:03 2016 +0200

    Remove patch applied upstream
---
 .../0001-Add-Debian-specific-SOVERSION.patch       |  2 +-
 ...002-Use-catkin-variables-for-install-dirs.patch | 29 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
index 9b2b929..daa8406 100644
--- a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
@@ -7,7 +7,7 @@ Subject: Add Debian specific SOVERSION
  1 file changed, 1 insertion(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7572c65..6f3d12a 100644
+index 6faa426..463883e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -17,6 +17,7 @@ catkin_package(
diff --git a/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch b/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch
deleted file mode 100644
index 0e32efe..0000000
--- a/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Mon, 23 Nov 2015 14:35:05 +0100
-Subject: Use catkin variables for install dirs
-
----
- CMakeLists.txt | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f3d12a..5add1dc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,12 +21,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${rosconsole_bridge_VER
- 
- install(
-   TARGETS ${PROJECT_NAME}
--  ARCHIVE DESTINATION lib
--  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
- )
- 
- install(
--  DIRECTORY include/
--  DESTINATION include
--  FILES_MATCHING PATTERN "*.h"
--)
-+  DIRECTORY include/${PROJECT_NAME}/
-+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
diff --git a/debian/patches/series b/debian/patches/series
index 7263444..6eac731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Add-Debian-specific-SOVERSION.patch
-0002-Use-catkin-variables-for-install-dirs.patch

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