[rviz] 03/04: Remove Python patch, part of upstream release

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository rviz.

commit c968f921fcd766da4482a22520d11502cde49e83
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Aug 6 07:55:27 2015 +0200

    Remove Python patch, part of upstream release
---
 ...package-python-version-detected-by-catkin.patch | 34 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 35 deletions(-)

diff --git a/debian/patches/0001-find_package-python-version-detected-by-catkin.patch b/debian/patches/0001-find_package-python-version-detected-by-catkin.patch
deleted file mode 100644
index 835a167..0000000
--- a/debian/patches/0001-find_package-python-version-detected-by-catkin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: v4hn <me at v4hn.de>
-Date: Fri, 8 May 2015 17:19:50 +0200
-Subject: find_package python version detected by catkin
-
-Otherwise it might happen that catkin (and the rest of the workspace)
-uses 2.x and rviz detects & tries to use 3.x. This can produce some nasty
-collisions.
-
-See rospack, roslz4, qt_gui_cpp and others for similar invokation.
----
- CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fb40bb..79b9168 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,8 +84,6 @@ endif()
- 
- find_package(OpenGL REQUIRED)
- 
--find_package(PythonLibs REQUIRED)
--
- find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtOpenGL)
- 
- find_package(catkin REQUIRED
-@@ -120,6 +118,7 @@ if(${tf_VERSION} VERSION_LESS "1.11.3")
-   add_definitions("-DRVIZ_USE_BOOST_SIGNAL_1")
- endif()
- 
-+find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
- 
- find_package(Eigen REQUIRED)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 3604896..6eac731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Add-Debian-specific-SOVERSION.patch
-0001-find_package-python-version-detected-by-catkin.patch

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