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

Tue Jun 10 17:09:20 UTC 2008

Author: modax-guest
Date: 2008-06-10 17:09:20 +0000 (Tue, 10 Jun 2008)
New Revision: 10946

Removed:
   branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff
Modified:
   branches/kde4/packages/kdepim/debian/changelog
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4/packages/kdepim/debian/patches/series
Log:
Some kde4pim fixups.

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================

--- branches/kde4/packages/kdepim/debian/changelog	2008-06-10 15:42:54 UTC (rev 10945)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-06-10 17:09:20 UTC (rev 10946)
@@ -1,4 +1,4 @@
-kde4pim (4:4.0.81+svn818944-1~pre1) UNRELEASED; urgency=low
+kde4pim (4:4.0.81+svn818944-1~pre2) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
   * Update install files:
@@ -12,12 +12,14 @@
   +++ Changes by Modestas Vainius:
 
   * Bump build depends to 4.0.81 and higher.
+  * Add myself to Uploaders.
+  * Merge 01_ and 97_ patches.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
   * Remove Recommends: kghostview from korganizer. It does not exist in KDE4.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Jun 2008 16:58:09 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Jun 2008 20:05:35 +0300
 
 kde4pim (4:4.0.80-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-06-10 15:42:54 UTC (rev 10945)
+++ branches/kde4/packages/kdepim/debian/control	2008-06-10 17:09:20 UTC (rev 10946)
@@ -2,7 +2,8 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
+ Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
 Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.4.5), quilt,
  kdelibs5-dev (>= 4:4.0.81+svn818551), kdepimlibs5-dev (>= 4:4.0.81),
  libphonon-dev (>= 4:4.2~), libplasma-dev (>= 4:4.0.81),

Deleted: branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff

Modified: branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-06-10 15:42:54 UTC (rev 10945)
+++ branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-06-10 17:09:20 UTC (rev 10946)
@@ -1,25 +1,58 @@
---- a/kode/schema/CMakeLists.txt
-+++ b/kode/schema/CMakeLists.txt
-@@ -20,7 +20,7 @@
+--- a/korganizer/CMakeLists.txt
++++ b/korganizer/CMakeLists.txt
+@@ -225,7 +225,7 @@
  
- kde4_add_library(schema SHARED ${schema_LIB_SRCS})
+ add_dependencies(korganizerprivate kmail)
  
--target_link_libraries(schema  ${KDE4_KIO_LIBS} kxmlcommon )
-+target_link_libraries(schema  ${KDE4_KIO_LIBS} kxmlcommon ${QT_QTXML_LIBRARY} )
+-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 )
  
- set_target_properties(schema PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- install(TARGETS schema  DESTINATION ${LIB_INSTALL_DIR})
---- a/libkdepim/CMakeLists.txt
+--- a/ktimetracker/CMakeLists.txt
++++ b/ktimetracker/CMakeLists.txt
+@@ -74,7 +74,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)
+--- a/akregator/src/CMakeLists.txt
++++ b/akregator/src/CMakeLists.txt
+@@ -31,7 +31,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})
+--- b/libkdepim/CMakeLists.txt
 +++ b/libkdepim/CMakeLists.txt
 @@ -87,7 +87,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} ${KDE4_KPARTS_LIBRARY})
+-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} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
  
  set_target_properties(kdepim PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
  install(TARGETS kdepim  DESTINATION ${LIB_INSTALL_DIR})
+--- a/kode/schema/CMakeLists.txt
++++ b/kode/schema/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ 
+ kde4_add_library(schema SHARED ${schema_LIB_SRCS})
+ 
+-target_link_libraries(schema  ${KDE4_KIO_LIBS} kxmlcommon )
++target_link_libraries(schema  ${KDE4_KIO_LIBS} kxmlcommon ${QT_QTXML_LIBRARY} )
+ 
+ set_target_properties(schema PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS schema  DESTINATION ${LIB_INSTALL_DIR})
 --- a/akonadi/plugins/CMakeLists.txt
 +++ b/akonadi/plugins/CMakeLists.txt
 @@ -24,7 +24,7 @@

Modified: branches/kde4/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/series	2008-06-10 15:42:54 UTC (rev 10945)
+++ branches/kde4/packages/kdepim/debian/patches/series	2008-06-10 17:09:20 UTC (rev 10946)
@@ -1,2 +1 @@
-01_cmake_fixups.diff
 97_fix_target_link_libraries.diff


