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

Ana Beatriz Guerrero López ana at alioth.debian.org
Fri Jul 11 00:21:38 UTC 2008


Author: ana
Date: 2008-07-11 00:21:38 +0000 (Fri, 11 Jul 2008)
New Revision: 11462

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/rules
Log:
kdepim


Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-07-10 23:13:14 UTC (rev 11461)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-07-11 00:21:38 UTC (rev 11462)
@@ -1,5 +1,6 @@
-kdepim (4:4.0.84-2) experimental; urgency=low
+kdepim (4:4.0.98-0) UNRELEASED; urgency=low
 
+  * New upstream release, Release Candidate 1.
   * Add 30_debianize_akregator_default.diff to include planet debian 
     and debian times as default in akregator.
 

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-07-10 23:13:14 UTC (rev 11461)
+++ branches/kde4/packages/kdepim/debian/control	2008-07-11 00:21:38 UTC (rev 11462)
@@ -5,7 +5,7 @@
 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.82), kdepimlibs5-dev (>= 4:4.0.82),
+ kdelibs5-dev (>= 4:4.0.98), kdepimlibs5-dev (>= 4:4.0.98),
  libphonon-dev (>= 4:4.2~), 
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0),

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-07-10 23:13:14 UTC (rev 11461)
+++ branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-07-11 00:21:38 UTC (rev 11462)
@@ -1,25 +1,14 @@
---- a/korganizer/CMakeLists.txt
-+++ b/korganizer/CMakeLists.txt
-@@ -225,7 +225,7 @@
+--- a/libkdepim/CMakeLists.txt
++++ b/libkdepim/CMakeLists.txt
+@@ -91,7 +91,7 @@
  
- add_dependencies(korganizerprivate kmail)
+ kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
  
--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 )
+-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})
  
---- 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)
+ if(MINGW)
+ target_link_libraries(kdepim oleaut32)
 --- a/akregator/src/CMakeLists.txt
 +++ b/akregator/src/CMakeLists.txt
 @@ -31,7 +31,7 @@
@@ -31,121 +20,26 @@
  
  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 @@
+--- a/ktimetracker/CMakeLists.txt
++++ b/ktimetracker/CMakeLists.txt
+@@ -74,7 +74,7 @@
  
- kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
+ kde4_add_plugin(karmpart ${karmpart_PART_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} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
+-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/korganizer/CMakeLists.txt
++++ b/korganizer/CMakeLists.txt
+@@ -226,7 +226,8 @@
  
- 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 @@
+ add_dependencies(korganizerprivate kmail)
  
- kde4_add_library(schema SHARED ${schema_LIB_SRCS})
+-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 )
  
--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 @@
- 
- set(akonadi_serializer_bookmark_SRCS akonadi_serializer_bookmark.cpp)
- kde4_add_plugin(akonadi_serializer_bookmark ${akonadi_serializer_bookmark_SRCS})
--target_link_libraries(akonadi_serializer_bookmark ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_AKONADI_LIBS})
-+target_link_libraries(akonadi_serializer_bookmark ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_AKONADI_LIBS} ${QT_QTXML_LIBRARY})
- install(TARGETS akonadi_serializer_bookmark DESTINATION ${PLUGIN_INSTALL_DIR})
- 
- ########### install files ###############
---- a/akonadi/resources/imap/CMakeLists.txt
-+++ b/akonadi/resources/imap/CMakeLists.txt
-@@ -2,7 +2,7 @@
- 
- kde4_add_library(imap SHARED ${imap_LIB_SRCS})
- 
--target_link_libraries(imap ${QT_AND_KDECORE_LIBS} ${QT_QTSQL_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIMAP_LIBS})
-+target_link_libraries(imap ${QT_AND_KDECORE_LIBS} ${QT_QTSQL_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIMAP_LIBS} ${QT_QTNETWORK_LIBRARY})
- 
- set_target_properties(imap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- install(TARGETS imap DESTINATION ${LIB_INSTALL_DIR})
---- a/libkleo/CMakeLists.txt
-+++ b/libkleo/CMakeLists.txt
-@@ -107,7 +107,7 @@
- if(WIN32)
- target_link_libraries(kleo ${kleo_LIB_LIBS}  ${GPGME_VANILLA_LIBRARIES} )
- else(WIN32)
--target_link_libraries(kleo ${kleo_LIB_LIBS} )
-+target_link_libraries(kleo ${kleo_LIB_LIBS} ${QT_QTDBUS_LIBRARY} )
- endif(WIN32)
- set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- install(TARGETS kleo DESTINATION ${LIB_INSTALL_DIR})
---- a/kmail/CMakeLists.txt
-+++ b/kmail/CMakeLists.txt
-@@ -264,7 +264,7 @@
- endif(WIN32)
- 
- kde4_add_library(kmailprivate SHARED ${kmailprivate_LIB_SRCS})
--kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_PHONON_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBRARY} ${KDE4_KIMAP_LIBRARY} ${KDE4_KPARTS_LIBRARY} kleo ${QGPGME_LIBRARIES} mimelib ksieve kpgp kdepim ${QT_QT3SUPPORT_LIBRARY})
-+kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_PHONON_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBRARY} ${KDE4_KIMAP_LIBRARY} ${KDE4_KPARTS_LIBRARY} kleo ${QGPGME_LIBRARIES} mimelib ksieve kpgp kdepim ${QT_QT3SUPPORT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
- if(WIN32)
-   kdepim4_link_unique_libraries(kmailprivate ${SQLITE_LIBRARIES})
- endif(WIN32)
---- a/kmobiletools/kmobiletools/libkmobiletools/CMakeLists.txt
-+++ b/kmobiletools/kmobiletools/libkmobiletools/CMakeLists.txt
-@@ -93,6 +93,7 @@
- kde4_add_library(kmobiletoolslib SHARED ${kmobiletoolslib_LIB_SRCS})
- 
- kdepim4_link_unique_libraries(kmobiletoolslib
-+${QT_QTDBUS_LIBRARY}
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}  
---- a/kontact/plugins/kmail/CMakeLists.txt
-+++ b/kontact/plugins/kmail/CMakeLists.txt
-@@ -27,7 +27,7 @@
- 
- kde4_add_plugin(kcm_kmailsummary ${kcm_kmailsummary_PART_SRCS})
- 
--kdepim4_link_unique_libraries(kcm_kmailsummary ${KDE4_KDEUI_LIBS})
-+kdepim4_link_unique_libraries(kcm_kmailsummary ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY})
- 
- ########### install files ###############
- 
---- a/kontact/plugins/newsticker/CMakeLists.txt
-+++ b/kontact/plugins/newsticker/CMakeLists.txt
-@@ -13,7 +13,7 @@
- 
- kde4_add_plugin(kcm_kontactknt ${kcm_kontactknt_PART_SRCS})
- 
--kdepim4_link_unique_libraries(kcm_kontactknt ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
-+kdepim4_link_unique_libraries(kcm_kontactknt ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY})
- 
- ########### install files ###############
- 
---- a/kpilot/conduits/base/CMakeLists.txt
-+++ b/kpilot/conduits/base/CMakeLists.txt
-@@ -32,6 +32,6 @@
- 
- kde4_add_kcfg_files(conduit_base_SRCS ${conduit_base_KCFGS})
- kde4_add_library(kpilot_conduit_base SHARED ${conduit_base_SRCS})
--target_link_libraries(kpilot_conduit_base ${QT_LIBRARIES} kpilot)
-+target_link_libraries(kpilot_conduit_base ${QT_LIBRARIES} kpilot ${QT_QTXML_LIBRARY})
- 
- install(TARGETS kpilot_conduit_base LIBRARY DESTINATION ${LIB_INSTALL_DIR})
---- a/kpilot/kpilot/CMakeLists.txt
-+++ b/kpilot/kpilot/CMakeLists.txt
-@@ -47,6 +47,7 @@
- kde4_add_plugin(kcm_kpilot ${kcmpilot_SRCS})
- 
- target_link_libraries(kcm_kpilot
-+${QT_QTDBUS_LIBRARY}
- 	kpilot
- 	${KDE4_KDEUI_LIBS}
- )

Modified: branches/kde4/packages/kdepim/debian/rules
===================================================================
--- branches/kde4/packages/kdepim/debian/rules	2008-07-10 23:13:14 UTC (rev 11461)
+++ branches/kde4/packages/kdepim/debian/rules	2008-07-11 00:21:38 UTC (rev 11462)
@@ -2,10 +2,10 @@
 
 include debian/cdbs/kde.mk
 
-DEB_DH_MAKESHLIBS_ARGS_libkdepim4 := -V'libkdepim4 (>= 4:4.0.82)'
-DEB_DH_MAKESHLIBS_ARGS_libkholidays4 := -V'libkholidays4 (>= 4:4.0.82)'
-DEB_DH_MAKESHLIBS_ARGS_libkleo4 :=  -V'libkleo4 (>= 4:4.0.82)'
-DEB_DH_MAKESHLIBS_ARGS_libkpgp4 :=  -V'libkpgp4 (>= 4:4.0.82)'
-DEB_DH_MAKESHLIBS_ARGS_libksieve4 :=  -V'libksieve4 (>= 4:4.0.82)'
-DEB_DH_MAKESHLIBS_ARGS_libmaildir4 :=  -V'libmaildir4 (>= 4:4.0.82)'
-DEB_DH_MAKESHLIBS_ARGS_libmimelib4 :=  -V'libmimelib4 (>= 4:4.0.82)'
+DEB_DH_MAKESHLIBS_ARGS_libkdepim4 := -V'libkdepim4 (>= 4:4.0.98)'
+DEB_DH_MAKESHLIBS_ARGS_libkholidays4 := -V'libkholidays4 (>= 4:4.0.98)'
+DEB_DH_MAKESHLIBS_ARGS_libkleo4 :=  -V'libkleo4 (>= 4:4.0.98)'
+DEB_DH_MAKESHLIBS_ARGS_libkpgp4 :=  -V'libkpgp4 (>= 4:4.0.98)'
+DEB_DH_MAKESHLIBS_ARGS_libksieve4 :=  -V'libksieve4 (>= 4:4.0.98)'
+DEB_DH_MAKESHLIBS_ARGS_libmaildir4 :=  -V'libmaildir4 (>= 4:4.0.98)'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib4 :=  -V'libmimelib4 (>= 4:4.0.98)'




More information about the pkg-kde-commits mailing list