rev 10252 - in branches/kde4/packages/kdepim/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-04-24 22:27:02 +0000 (Thu, 24 Apr 2008)
New Revision: 10252

Added:
   branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff
Modified:
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepim/debian/patches/series
Log:
fix cmake and build-deps

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-04-24 21:35:20 UTC (rev 10251)
+++ branches/kde4/packages/kdepim/debian/control	2008-04-24 22:27:02 UTC (rev 10252)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, 
- kdepimlibs5-dev (>=4:4.0.68), libphonon-dev (>=4:4.0.68), libplasma-dev (>=4:4.0.68), 
+ kdepimlibs5-dev (>=4:4.0.68+svn798657), libphonon-dev (>=4:4.0.68)
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0-5),
  libpisock-dev, libopensync1exp3-dev, libassuan-dev,
  libstreams-dev, libstreamanalyzer-dev, libsearchclient-dev,  
- libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, 
+ libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, zlib1g-dev,
 Standards-Version: 3.7.2
 Homepage: http://pim.kde.org/
 

Added: branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff	                        (rev 0)
+++ branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff	2008-04-24 22:27:02 UTC (rev 10252)
@@ -0,0 +1,52 @@
+Index: b/korganizer/CMakeLists.txt
+===================================================================
+--- a/korganizer/CMakeLists.txt
++++ b/korganizer/CMakeLists.txt
+@@ -223,7 +223,7 @@
+ 
+ add_dependencies(korganizerprivate kmail)
+ 
+-target_link_libraries(korganizerprivate ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_KCAL_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_KMIME_LIBRARY}
++target_link_libraries(korganizerprivate ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_KCAL_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_KMIME_LIBRARY} ${ZLIB_LIBRARY}
+                                                       kdepim korganizer_eventviewer korganizer_calendar kocorehelper
+                                                       korg_stdprinting kholidays korganizer_interfaces )
+ 
+Index: b/ktimetracker/CMakeLists.txt
+===================================================================
+--- a/ktimetracker/CMakeLists.txt
++++ b/ktimetracker/CMakeLists.txt
+@@ -73,7 +73,7 @@
+ 
+ kde4_add_plugin(karmpart ${karmpart_PART_SRCS})
+ 
+-target_link_libraries(karmpart  ${KDE4_KCAL_LIBS}  ${KDE4_KIO_LIBS} kdepim kcal_resourceremote)
++target_link_libraries(karmpart  ${KDE4_KCAL_LIBS}  ${KDE4_KIO_LIBS} ${X11_X11_LIB} kdepim kcal_resourceremote)
+ if(X11_Xscreensaver_LIB)
+ 	target_link_libraries(karmpart  ${X11_Xscreensaver_LIB} )
+ endif(X11_Xscreensaver_LIB)
+Index: b/akregator/src/CMakeLists.txt
+===================================================================
+--- a/akregator/src/CMakeLists.txt
++++ b/akregator/src/CMakeLists.txt
+@@ -33,7 +33,7 @@
+ 
+ kde4_add_library(akregatorprivate SHARED ${akregatorprivate_LIB_SRCS})
+ 
+-target_link_libraries(akregatorprivate kdepim  ${KDE4_KHTML_LIBS} ${KDE4_SYNDICATION_LIBS} akregatorinterfaces )
++target_link_libraries(akregatorprivate kdepim  ${KDE4_KHTML_LIBS} ${KDE4_SYNDICATION_LIBS} ${KDE4_SOLID_LIBRARY} akregatorinterfaces )
+ 
+ set_target_properties(akregatorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS akregatorprivate DESTINATION ${LIB_INSTALL_DIR})
+Index: b/libkdepim/CMakeLists.txt
+===================================================================
+--- a/libkdepim/CMakeLists.txt
++++ b/libkdepim/CMakeLists.txt
+@@ -92,7 +92,7 @@
+ 
+ kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
+ 
+-target_link_libraries(kdepim  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS}  kimproxy ${KDE4_KPIMUTILS_LIBS} ${KDE4_KLDAP_LIBS} ${KDE4_KPIMIDENTITIES_LIBS})
++target_link_libraries(kdepim  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS}  kimproxy ${KDE4_KPIMUTILS_LIBS} ${KDE4_KLDAP_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_KPARTS_LIBRARY})
+ 
+ set_target_properties(kdepim PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS kdepim  DESTINATION ${LIB_INSTALL_DIR})

Modified: branches/kde4/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/series	2008-04-24 21:35:20 UTC (rev 10251)
+++ branches/kde4/packages/kdepim/debian/patches/series	2008-04-24 22:27:02 UTC (rev 10252)
@@ -0,0 +1 @@
+01_cmake_fixups.diff