[ros-rviz] 01/06: Rebase patches

[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-rviz.

commit 25b9079567a5f3c2b19eda3502cd5782e445cdf0
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jul 22 15:33:36 2016 +0200

    Rebase patches
---
 .../patches/0001-Add-Debian-specific-SOVERSION.patch | 10 +++++-----
 ...move-default_plugin-from-exported-libraries.patch | 20 --------------------
 .../patches/0003-Replace-Arial-by-generic-Font.patch |  4 ++--
 debian/patches/series                                |  1 -
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
index a219482..1e2b53f 100644
--- a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
@@ -7,13 +7,13 @@ Subject: Add Debian specific SOVERSION
  1 file changed, 1 insertion(+)
 
 diff --git a/src/rviz/CMakeLists.txt b/src/rviz/CMakeLists.txt
-index 5dad564..40a87cd 100644
+index a91330b..d911cdf 100644
 --- a/src/rviz/CMakeLists.txt
 +++ b/src/rviz/CMakeLists.txt
-@@ -198,6 +198,7 @@ target_link_libraries(${PROJECT_NAME}
-   assimp
-   yaml-cpp
- )
+@@ -140,6 +140,7 @@ else()
+   target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
+ endif()
+ 
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${rviz_VERSION} SOVERSION "0d")
  
  if(APPLE)
diff --git a/debian/patches/0002-Remove-default_plugin-from-exported-libraries.patch b/debian/patches/0002-Remove-default_plugin-from-exported-libraries.patch
deleted file mode 100644
index 2e34c52..0000000
--- a/debian/patches/0002-Remove-default_plugin-from-exported-libraries.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sat, 5 Dec 2015 18:52:09 +0100
-Subject: Remove default_plugin from exported libraries
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 401540e..8a4a5ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -143,7 +143,6 @@ catkin_package(
-     ${OPENGL_INCLUDE_DIR}
-   LIBRARIES
-     rviz
--    default_plugin
-     ${OGRE_OV_LIBRARIES_ABS}
-     ${rviz_ADDITIONAL_LIBRARIES}
-     ${OPENGL_LIBRARIES}
diff --git a/debian/patches/0003-Replace-Arial-by-generic-Font.patch b/debian/patches/0003-Replace-Arial-by-generic-Font.patch
index fc3df08..a042a11 100644
--- a/debian/patches/0003-Replace-Arial-by-generic-Font.patch
+++ b/debian/patches/0003-Replace-Arial-by-generic-Font.patch
@@ -28,10 +28,10 @@ index 651dd24..94497d7 100644
    resolution 96
  }
 diff --git a/src/rviz/default_plugin/tf_display.cpp b/src/rviz/default_plugin/tf_display.cpp
-index 89a39fc..b8a7163 100644
+index f05a615..8eafa34 100644
 --- a/src/rviz/default_plugin/tf_display.cpp
 +++ b/src/rviz/default_plugin/tf_display.cpp
-@@ -414,7 +414,7 @@ FrameInfo* TFDisplay::createFrame(const std::string& frame)
+@@ -437,7 +437,7 @@ FrameInfo* TFDisplay::createFrame(const std::string& frame)
    info->selection_handler_.reset( new FrameSelectionHandler( info, this, context_ ));
    info->selection_handler_->addTrackedObjects( info->axes_->getSceneNode() );
  
diff --git a/debian/patches/series b/debian/patches/series
index dbc3c0a..34b2ea2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Add-Debian-specific-SOVERSION.patch
-0002-Remove-default_plugin-from-exported-libraries.patch
 0003-Replace-Arial-by-generic-Font.patch

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