[SCM] KDE Education module packaging branch, master, updated. debian/4.4.5-1-10-g876e8c1

Modestas Vainius modax at alioth.debian.org
Mon Jul 26 22:59:25 UTC 2010


The following commit has been merged in the master branch:
commit 3608e99c6d5ff30c533fcd7e895d068b90602137
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Jul 27 01:13:11 2010 +0300

    Disable INSTALL_RPATH_USE_LINK_PATH in cantor-backend-r and kalzium.
    
    It triggers unnecessary install RPATH (patch
    02_no_install_rpath_use_link_path.diff).
---
 debian/changelog                                   |    3 ++
 .../patches/02_no_install_rpath_use_link_path.diff |   39 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bc9c13..0acaa7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 kdeedu (4:4.4.5-2) UNRELEASED; urgency=low
 
   * Point debian/control Vcs fields to the new Git repository.
+  * Disable INSTALL_RPATH_USE_LINK_PATH in cantor-backend-r and kalzium
+    because it triggers unnecessary install RPATH (patch
+    02_no_install_rpath_use_link_path.diff).
 
  -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:24:35 +0300
 
diff --git a/debian/patches/02_no_install_rpath_use_link_path.diff b/debian/patches/02_no_install_rpath_use_link_path.diff
new file mode 100644
index 0000000..cfe9b0f
--- /dev/null
+++ b/debian/patches/02_no_install_rpath_use_link_path.diff
@@ -0,0 +1,39 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: disable INSTALL_RPATH_USE_LINK_PATH where it triggers useless RPATH
+ .
+ cantor-backend-r: lintian output: 'binary-or-shlib-defines-rpath ./usr/bin/cantor_rserver /usr/lib64/R/lib', automatically rejected package.
+ cantor-backend-r: lintian output: 'binary-or-shlib-defines-rpath ./usr/lib/kde4/cantor_rbackend.so /usr/lib64/R/lib', automatically rejected package.
+ kalzium: lintian output: 'binary-or-shlib-defines-rpath ./usr/bin/kalzium /usr/lib/ocaml', automatically rejected package.
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2010-07-27
+--- a/cantor/src/backends/R/CMakeLists.txt
++++ b/cantor/src/backends/R/CMakeLists.txt
+@@ -18,6 +18,7 @@ QT4_ADD_DBUS_INTERFACE(RBackend_SRCS ${n
+ kde4_add_ui_files(RBackend_SRCS settings.ui)
+ 
+ kde4_add_plugin( cantor_rbackend ${RBackend_SRCS} )
++set_target_properties( cantor_rbackend PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
+ target_link_libraries( cantor_rbackend ${KDE4_KDEUI_LIBS} cantorlibs ${R_USED_LIBS})
+ 
+ install( FILES rbackend.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
+--- a/cantor/src/backends/R/rserver/CMakeLists.txt
++++ b/cantor/src/backends/R/rserver/CMakeLists.txt
+@@ -18,6 +18,7 @@ add_custom_target(renvvars COMMAND ${R_E
+ add_custom_target(rautoloads COMMAND ${R_EXECUTABLE} --slave --file=${CMAKE_CURRENT_SOURCE_DIR}/tools/autoloads.r > ${CMAKE_CURRENT_BINARY_DIR}/rautoloads.h )
+ 
+ kde4_add_executable( cantor_rserver ${RServer_SRCS} )
++set_target_properties( cantor_rserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
+ target_link_libraries( cantor_rserver ${KDE4_KDEUI_LIBS} cantorlibs ${R_USED_LIBS} ${KDE4_KIO_LIBS})
+ add_dependencies(cantor_rserver renvvars rautoloads)
+ 
+--- a/kalzium/src/CMakeLists.txt
++++ b/kalzium/src/CMakeLists.txt
+@@ -131,6 +131,7 @@ kde4_add_app_icon(kalzium_SRCS "${CMAKE_
+ 
+ kde4_add_executable(kalzium ${kalzium_SRCS} )
+ 
++set_target_properties(kalzium PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
+ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KUNITCONVERSION_LIBS} science kdeeduui)
+ 
+ if (OPENBABEL2_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index 3827636..8a29c1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_step_needs_-lcln.diff
+02_no_install_rpath_use_link_path.diff

-- 
KDE Education module packaging



More information about the pkg-kde-commits mailing list