[SCM] KDE Education module packaging branch, master, updated. debian/4.6.3-2-11-g9d72469

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Wed Jul 13 21:39:59 UTC 2011


The following commit has been merged in the master branch:
commit 775feb33e9c72b87064cd7afb035ab6e86edfd83
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Jul 9 13:32:17 2011 +0200

    Refresh patches.
---
 debian/changelog                                   |    1 +
 debian/patches/no_install_rpath_use_link_path.diff |   11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ff90f0..f5bb003 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kdeedu (4:4.6.5-0r0) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.6.5.
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Jun 2011 21:29:26 +0200
 
diff --git a/debian/patches/no_install_rpath_use_link_path.diff b/debian/patches/no_install_rpath_use_link_path.diff
index 85355e8..adcbec8 100644
--- a/debian/patches/no_install_rpath_use_link_path.diff
+++ b/debian/patches/no_install_rpath_use_link_path.diff
@@ -6,7 +6,14 @@ Subject: disable INSTALL_RPATH_USE_LINK_PATH where it triggers useless RPATH
  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
+Last-Update: 2011-07-09
+---
+ cantor/src/backends/R/CMakeLists.txt         |    1 +
+ cantor/src/backends/R/rserver/CMakeLists.txt |    1 +
+ kalzium/compoundviewer/CMakeLists.txt        |    3 ++-
+ kalzium/src/CMakeLists.txt                   |    1 +
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+
 --- a/cantor/src/backends/R/rserver/CMakeLists.txt
 +++ b/cantor/src/backends/R/rserver/CMakeLists.txt
 @@ -17,6 +17,7 @@ add_custom_target(renvvars COMMAND ${R_E
@@ -24,7 +31,7 @@ Last-Update: 2010-07-27
  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_KNEWSTUFF3_LIBS} ${KDE4_KUNITCONVERSION_LIBS} science kdeeduui)
+ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KUNITCONVERSION_LIBS} science)
  
  if (OPENBABEL2_FOUND)
 --- a/cantor/src/backends/R/CMakeLists.txt

-- 
KDE Education module packaging



More information about the pkg-kde-commits mailing list