[SCM] Calligra suite packaging. branch, master, updated. 547ed6d9dddb63728eded39cbd3c0a05331c5bac

[Adrien Grellier]

The following commit has been merged in the master branch:
commit 547ed6d9dddb63728eded39cbd3c0a05331c5bac
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Thu Sep 22 22:04:21 2011 +0200

    backport patch to rename liblibrcp
---
 debian/calligraplan.install                |    4 +-
 debian/patches/librcps_remvoe_liblib.patch |   63 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/debian/calligraplan.install b/debian/calligraplan.install
index 074e311..fa41d7f 100644
--- a/debian/calligraplan.install
+++ b/debian/calligraplan.install
@@ -15,8 +15,8 @@ usr/lib/libkplatomodels.so.8
 usr/lib/libkplatomodels.so.8.0.0
 usr/lib/libkplatoui.so.8
 usr/lib/libkplatoui.so.8.0.0
-usr/lib/liblibrcps_plan.so.8
-usr/lib/liblibrcps_plan.so.8.0.0
+usr/lib/librcps_plan.so.8
+usr/lib/librcps_plan.so.8.0.0
 usr/lib/libplanprivate.so.8
 usr/lib/libplanprivate.so.8.0.0
 usr/lib/libplanworkapp.so.8
diff --git a/debian/patches/librcps_remvoe_liblib.patch b/debian/patches/librcps_remvoe_liblib.patch
new file mode 100644
index 0000000..c42812f
--- /dev/null
+++ b/debian/patches/librcps_remvoe_liblib.patch
@@ -0,0 +1,63 @@
+From: Dag Andersen <danders at get2net.dk>
+Date: Thu, 22 Sep 2011 07:01:57 +0000
+Subject: Rename liblibrcps_plan -> librcps_plan
+X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=55c1f31299209f099799c6f6b022bffe42bb7f06
+---
+Rename liblibrcps_plan -> librcps_plan
+
+CCMAIL: adrien.grellier at laposte.net
+---
+
+
+Index: calligra-2.3.81/plan/plugins/schedulers/rcps/CMakeLists.txt
+===================================================================
+--- calligra-2.3.81.orig/plan/plugins/schedulers/rcps/CMakeLists.txt	2011-09-11 15:34:44.000000000 +0200
++++ calligra-2.3.81/plan/plugins/schedulers/rcps/CMakeLists.txt	2011-09-22 22:02:29.643114960 +0200
+@@ -16,7 +16,7 @@
+     kplatorcpsscheduler
+     kplatokernel
+     koodf
+-    librcps_plan
++    rcps_plan
+ #    ${LIBRCPS_LIBRARIES}
+ )
+ 
+Index: calligra-2.3.81/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt
+===================================================================
+--- calligra-2.3.81.orig/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt	2011-09-18 19:18:52.996864031 +0200
++++ calligra-2.3.81/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt	2011-09-22 22:02:29.683115157 +0200
+@@ -24,16 +24,16 @@
+ endif()
+ 
+ if(WIN32)
+-    kde4_add_library(librcps_plan STATIC ${librcps_LIB_SRCS})
++    kde4_add_library(rcps_plan STATIC ${librcps_LIB_SRCS})
+ else(WIN32)
+-    kde4_add_library(librcps_plan SHARED ${librcps_LIB_SRCS})
++    kde4_add_library(rcps_plan SHARED ${librcps_LIB_SRCS})
+ endif(WIN32)
+ 
+ target_link_libraries(
+-    librcps_plan
++    rcps_plan
+     ${CMAKE_THREAD_LIBS_INIT}
+ )
+ 
+-set_target_properties(librcps_plan PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
++set_target_properties(rcps_plan PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
+ 
+-install(TARGETS librcps_plan ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS rcps_plan ${INSTALL_TARGETS_DEFAULT_ARGS})
+Index: calligra-2.3.81/plan/plugins/schedulers/rcps/tests/CMakeLists.txt
+===================================================================
+--- calligra-2.3.81.orig/plan/plugins/schedulers/rcps/tests/CMakeLists.txt	2011-09-11 15:34:44.000000000 +0200
++++ calligra-2.3.81/plan/plugins/schedulers/rcps/tests/CMakeLists.txt	2011-09-22 22:02:29.707115280 +0200
+@@ -9,7 +9,7 @@
+  
+ kde4_add_unit_test(ProjectTester TESTNAME Plan-RCPSTester  ${ProjectTester_SRCS})
+  
+-target_link_libraries(ProjectTester  ${KDE4_KDECORE_LIBS} librcps_plan planprivate kplatokernel  ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
++target_link_libraries(ProjectTester  ${KDE4_KDECORE_LIBS} rcps_plan planprivate kplatokernel  ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
+  
+ 
+ ########### next target ###############
diff --git a/debian/patches/series b/debian/patches/series
index 9008ea9..561e82a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ jpeg_filter_compile_with_lcms2.patch
 plan-shlib-without-versioned-soname.patch
 upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch
 braindump_shlib-without-versioned-soname.patch
+librcps_remvoe_liblib.patch

-- 
Calligra suite packaging.