[SCM] gammaray packaging branch, master, updated. debian/1.2.2-1-3-g54bfc4a

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 5f2c440665583587137978c5cb5c7de29e4e0bcb
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jan 10 20:20:06 2013 +0100

    Don't set RPATH in binaries.
    
    Prevents binary-or-shlib-defines-rpath lintian error.
---
 debian/changelog                     |    2 ++
 debian/patches/series                |    1 +
 debian/patches/use-empty-rpath.patch |   21 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a50898..533e95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gammaray (1.2.2-2) UNRELEASED; urgency=low
 
   * Add dependency on VTK 5.10 and enable object visualizer plugin.
+  * Don't set RPATH in binaries; prevents binary-or-shlib-defines-rpath
+    lintian error.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 10 Jan 2013 19:20:50 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index d08fd35..beb6757 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ widget-export-actions-location.patch
 harfbuzz-search-path.patch
 find-widget-export-actions-when-attaching.patch
 gammaray-probe-versioned-soname.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..da24efe
--- /dev/null
+++ b/debian/patches/use-empty-rpath.patch
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 10 Jan 2013 20:16:29 +0100
+Subject: use-empty-rpath
+
+---
+ CMakeLists.txt |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4bbee30..1e62b19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,8 +30,6 @@ set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMM
+ set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
+ set(GAMMARAY_PROBE_SOVERSION "${GAMMARAY_VERSION_STRING}")
+ 
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+ 
+ enable_testing()

-- 
gammaray packaging