[SCM] KDE Education module packaging branch, master, updated. debian/4.4.5-2-42-g196ba81
Modestas Vainius
modax at alioth.debian.org
Tue Mar 29 21:36:57 UTC 2011
The following commit has been merged in the master branch:
commit f40be7991562d02ddeeddf5594d0994effa61594
Author: Modestas Vainius <modax at debian.org>
Date: Tue Mar 29 21:32:29 2011 +0300
Refresh patches.
---
.../patches/02_no_install_rpath_use_link_path.diff | 8 ++++----
debian/patches/03_fix_kalgebramobile_ftbfs.diff | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/patches/02_no_install_rpath_use_link_path.diff b/debian/patches/02_no_install_rpath_use_link_path.diff
index 660eb1c..85355e8 100644
--- a/debian/patches/02_no_install_rpath_use_link_path.diff
+++ b/debian/patches/02_no_install_rpath_use_link_path.diff
@@ -9,7 +9,7 @@ Origin: vendor
Last-Update: 2010-07-27
--- a/cantor/src/backends/R/rserver/CMakeLists.txt
+++ b/cantor/src/backends/R/rserver/CMakeLists.txt
-@@ -17,6 +17,7 @@
+@@ -17,6 +17,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} )
@@ -19,7 +19,7 @@ Last-Update: 2010-07-27
--- a/kalzium/src/CMakeLists.txt
+++ b/kalzium/src/CMakeLists.txt
-@@ -130,6 +130,7 @@
+@@ -130,6 +130,7 @@ kde4_add_app_icon(kalzium_SRCS "${CMAKE_
kde4_add_executable(kalzium ${kalzium_SRCS})
@@ -29,7 +29,7 @@ Last-Update: 2010-07-27
if (OPENBABEL2_FOUND)
--- a/cantor/src/backends/R/CMakeLists.txt
+++ b/cantor/src/backends/R/CMakeLists.txt
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ QT4_ADD_DBUS_INTERFACE(RBackend_SRCS ${n
kde4_add_ui_files(RBackend_SRCS settings.ui)
kde4_add_plugin( cantor_rbackend ${RBackend_SRCS} )
@@ -39,7 +39,7 @@ Last-Update: 2010-07-27
install( FILES rbackend.desktop DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
--- a/kalzium/compoundviewer/CMakeLists.txt
+++ b/kalzium/compoundviewer/CMakeLists.txt
-@@ -22,6 +22,7 @@
+@@ -22,6 +22,7 @@ target_link_libraries(compoundviewer
avogadro
)
diff --git a/debian/patches/03_fix_kalgebramobile_ftbfs.diff b/debian/patches/03_fix_kalgebramobile_ftbfs.diff
index 8b25cb0..690554b 100644
--- a/debian/patches/03_fix_kalgebramobile_ftbfs.diff
+++ b/debian/patches/03_fix_kalgebramobile_ftbfs.diff
@@ -5,9 +5,9 @@ Applied-Upstream: 4.6.2, commit:1223184
--- a/kalgebra/mobile/CMakeLists.txt
+++ b/kalgebra/mobile/CMakeLists.txt
-@@ -5,6 +5,8 @@
+@@ -5,6 +5,8 @@ kde4_add_executable(kalgebramobile
- target_link_libraries(kalgebramobile ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY}
+ target_link_libraries(kalgebramobile ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY}
# ${QT_QTSCRIPTTOOLS_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
--
KDE Education module packaging
More information about the pkg-kde-commits
mailing list