[SCM] gammaray packaging branch, experimental, updated. debian/2.1.0-3-18-gfe11e49

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=fe11e49

The following commit has been merged in the experimental branch:
commit fe11e4952c6a2eda4486994ef7ffcfb397ef99d9
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Dec 13 11:50:05 2014 +0100

    Don't set RPATH in binaries
---
 debian/changelog                     |  2 ++
 debian/patches/series                |  1 +
 debian/patches/use-empty-rpath.patch | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c36e29b..31e0e97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gammaray (2.2.0-1) UNRELEASED; urgency=medium
   * Update d/changelog with (re)moved files.
   * Re-enable objectvisualizer plugin since Qt5-compatible VTK has become
     available.
+  * Don't set RPATH in binaries; prevents binary-or-shlib-defines-rpath
+    lintian error.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 12 Dec 2014 21:56:04 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 8db3a3a..ea4ec13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debian-archs-fix-build.patch
 fix-objectvisualizer-build.patch
+use-empty-rpath.patch
diff --git a/debian/patches/use-empty-rpath.patch b/debian/patches/use-empty-rpath.patch
new file mode 100644
index 0000000..e84b281
--- /dev/null
+++ b/debian/patches/use-empty-rpath.patch
@@ -0,0 +1,20 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 13 Dec 2014 11:47:50 +0100
+Subject: use-empty-rpath
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e95302..cd44363 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,6 @@ cmake_policy(SET CMP0020 NEW)
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${CMAKE_MODULE_PATH})
+ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ if(NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)

-- 
gammaray packaging