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

Sune Vuorela pusling-guest at alioth.debian.org
Mon Sep 1 21:19:36 UTC 2008


Author: pusling-guest
Date: 2008-09-01 21:19:36 +0000 (Mon, 01 Sep 2008)
New Revision: 12032

Added:
   branches/kde4/packages/kdepim/debian/patches/01_reenable_strigi.diff
   branches/kde4/packages/kdepim/debian/patches/02_fix_akonadi_feeders.diff
Modified:
   branches/kde4/packages/kdepim/debian/changelog
   branches/kde4/packages/kdepim/debian/kalarm.install
   branches/kde4/packages/kdepim/debian/kdepim-wizards.install
   branches/kde4/packages/kdepim/debian/libkholidays4.install
   branches/kde4/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
   branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4/packages/kdepim/debian/patches/series
Log:
* New upstream release
* Add patches to fix upstream build system. Also committed upstream. Maybe
  there comes new tarballs.
* File in libkholidays renamed
* groupwarewizard is problematic. we probably need to go thru NEW, so hold
  on a bit.

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-09-01 19:15:11 UTC (rev 12031)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-09-01 21:19:36 UTC (rev 12032)
@@ -1,3 +1,14 @@
+kdepim (4:4.1.1-0) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Add patches to fix upstream build system. Also committed upstream. Maybe
+    there comes new tarballs.
+  * File in libkholidays renamed
+  * groupwarewizard is problematic. we probably need to go thru NEW, so hold
+    on a bit.
+
+ -- Sune Vuorela <debian at pusling.com>  Mon, 01 Sep 2008 22:10:51 +0200
+
 kdepim (4:4.1.0-2) experimental; urgency=low
 
   +++ Changes by Sune Vuorela:

Modified: branches/kde4/packages/kdepim/debian/kalarm.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kalarm.install	2008-09-01 19:15:11 UTC (rev 12031)
+++ branches/kde4/packages/kdepim/debian/kalarm.install	2008-09-01 21:19:36 UTC (rev 12032)
@@ -22,6 +22,7 @@
 usr/share/kde4/apps/kalarm/kalarmui.rc
 usr/share/kde4/apps/kconf_update/kalarm-1.2.1-general.pl
 usr/share/kde4/apps/kconf_update/kalarm-1.9.5-defaults.pl
+usr/share/kde4/apps/kconf_update/kalarm-2.0.2-general.pl
 usr/share/kde4/apps/kconf_update/kalarm-version.pl
 usr/share/kde4/apps/kconf_update/kalarm.upd
 usr/share/kde4/config.kcfg/kalarmconfig.kcfg

Modified: branches/kde4/packages/kdepim/debian/kdepim-wizards.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kdepim-wizards.install	2008-09-01 19:15:11 UTC (rev 12031)
+++ branches/kde4/packages/kdepim/debian/kdepim-wizards.install	2008-09-01 21:19:36 UTC (rev 12032)
@@ -1,5 +1,4 @@
 usr/bin/egroupwarewizard
-usr/bin/groupwarewizard
 usr/bin/kolabwizard
 usr/bin/scalixwizard
 usr/bin/sloxwizard

Modified: branches/kde4/packages/kdepim/debian/libkholidays4.install
===================================================================
--- branches/kde4/packages/kdepim/debian/libkholidays4.install	2008-09-01 19:15:11 UTC (rev 12031)
+++ branches/kde4/packages/kdepim/debian/libkholidays4.install	2008-09-01 21:19:36 UTC (rev 12032)
@@ -29,7 +29,7 @@
 usr/share/kde4/apps/libkholidays/holiday_il
 usr/share/kde4/apps/libkholidays/holiday_is
 usr/share/kde4/apps/libkholidays/holiday_it
-usr/share/kde4/apps/libkholidays/holiday_ja
+usr/share/kde4/apps/libkholidays/holiday_jp
 usr/share/kde4/apps/libkholidays/holiday_lt
 usr/share/kde4/apps/libkholidays/holiday_mx
 usr/share/kde4/apps/libkholidays/holiday_nl

Added: branches/kde4/packages/kdepim/debian/patches/01_reenable_strigi.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/01_reenable_strigi.diff	                        (rev 0)
+++ branches/kde4/packages/kdepim/debian/patches/01_reenable_strigi.diff	2008-09-01 21:19:36 UTC (rev 12032)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -179,7 +179,7 @@
+   endif (Q_WS_X11)
+ 
+   add_subdirectory(kdgantt1)
+-  #macro_optional_add_subdirectory(strigi-analyzer)
++  macro_optional_add_subdirectory(strigi-analyzer)
+   if(QGPGME_FOUND AND KMAIL_SUPPORTED)
+      macro_optional_add_subdirectory(kmailcvt)
+      message(STATUS "KMailCVT support enabled.")

Added: branches/kde4/packages/kdepim/debian/patches/02_fix_akonadi_feeders.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/02_fix_akonadi_feeders.diff	                        (rev 0)
+++ branches/kde4/packages/kdepim/debian/patches/02_fix_akonadi_feeders.diff	2008-09-01 21:19:36 UTC (rev 12032)
@@ -0,0 +1,30 @@
+--- a/akonadi/agents/nepomuk_contact_feeder/CMakeLists.txt
++++ b/akonadi/agents/nepomuk_contact_feeder/CMakeLists.txt
+@@ -5,7 +5,6 @@
+   ${NEPOMUK_INCLUDES}
+   )
+ 
+-if(HAVE_NIE)
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+ 
+   kde4_add_executable(akonadi_nepomuk_contact_feeder RUN_UNINSTALLED nepomukcontactfeeder.cpp)
+@@ -22,4 +21,3 @@
+   install(TARGETS akonadi_nepomuk_contact_feeder ${INSTALL_TARGETS_DEFAULT_ARGS})
+   install(FILES nepomukcontactfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
+ 
+-endif(HAVE_NIE)
+--- a/akonadi/agents/nepomuk_email_feeder/CMakeLists.txt
++++ b/akonadi/agents/nepomuk_email_feeder/CMakeLists.txt
+@@ -4,7 +4,6 @@
+   ${Boost_INCLUDE_DIR}
+   )
+ 
+-if(HAVE_NIE)
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+ 
+   set(akonadi_nepomuk_email_feeder_SRCS nepomukemailfeeder.cpp)
+@@ -26,4 +25,3 @@
+ 
+   install(TARGETS akonadi_nepomuk_email_feeder ${INSTALL_TARGETS_DEFAULT_ARGS})
+   install(FILES nepomukemailfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
+-endif(HAVE_NIE)

Modified: branches/kde4/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2008-09-01 19:15:11 UTC (rev 12031)
+++ branches/kde4/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2008-09-01 21:19:36 UTC (rev 12032)
@@ -1,8 +1,6 @@
-Index: kdepim-4.0.84/akregator/src/akregator_part.cpp
-===================================================================
---- kdepim-4.0.84.orig/akregator/src/akregator_part.cpp	2008-06-18 14:42:07.000000000 +0200
-+++ kdepim-4.0.84/akregator/src/akregator_part.cpp	2008-06-29 21:46:11.000000000 +0200
-@@ -342,6 +342,20 @@
+--- a/akregator/src/akregator_part.cpp
++++ b/akregator/src/akregator_part.cpp
+@@ -344,6 +344,20 @@
      look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf");
      mainFolder.appendChild(look);
  

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-09-01 19:15:11 UTC (rev 12031)
+++ branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-09-01 21:19:36 UTC (rev 12032)
@@ -1,65 +1,63 @@
---- a/libkdepim/CMakeLists.txt
-+++ b/libkdepim/CMakeLists.txt
-@@ -91,7 +91,7 @@
+--- a/akonadi/kabc/CMakeLists.txt
++++ b/akonadi/kabc/CMakeLists.txt
+@@ -20,6 +20,6 @@
+ qt4_wrap_ui(kabcakonadi_LIB_SRC kabcitemeditor.ui)
+ kde4_add_library( akonadi-kabc SHARED ${kabcakonadi_LIB_SRC} )
  
- kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
+-target_link_libraries( akonadi-kabc ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS} )
++target_link_libraries( akonadi-kabc ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} )
+ set_target_properties( akonadi-kabc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS akonadi-kabc DESTINATION ${LIB_INSTALL_DIR})
+--- a/akonadi/kcal/CMakeLists.txt
++++ b/akonadi/kcal/CMakeLists.txt
+@@ -18,6 +18,6 @@
  
--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})
+ kde4_add_library( akonadi-kcal SHARED ${kcalakonadi_LIB_SRC} )
  
- if(MINGW)
- target_link_libraries(kdepim oleaut32)
---- a/akregator/src/CMakeLists.txt
-+++ b/akregator/src/CMakeLists.txt
-@@ -31,7 +31,7 @@
+-target_link_libraries( akonadi-kcal ${KDE4_AKONADI_LIBS} ${KDE4_KCAL_LIBS} )
++target_link_libraries( akonadi-kcal ${KDE4_AKONADI_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} )
+ set_target_properties( akonadi-kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS akonadi-kcal DESTINATION ${LIB_INSTALL_DIR})
+--- a/kresources/akonadi/kabc/CMakeLists.txt
++++ b/kresources/akonadi/kabc/CMakeLists.txt
+@@ -8,7 +8,7 @@
  
- kde4_add_library(akregatorprivate SHARED ${akregatorprivate_LIB_SRCS})
+ kde4_add_plugin(kabc_akonadi ${kabc_akonadi_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 )
+-target_link_libraries(kabc_akonadi ${KDE4_KABC_LIBS} ${KDE4_AKONADI_LIBS})
++target_link_libraries(kabc_akonadi ${KDE4_KABC_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KRESOURCES_LIBRARY})
  
- set_target_properties(akregatorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- install(TARGETS akregatorprivate DESTINATION ${LIB_INSTALL_DIR})
---- a/ktimetracker/CMakeLists.txt
-+++ b/ktimetracker/CMakeLists.txt
-@@ -74,7 +74,7 @@
  
- kde4_add_plugin(karmpart ${karmpart_PART_SRCS})
+ install(TARGETS kabc_akonadi  DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- a/kresources/akonadi/kcal/CMakeLists.txt
++++ b/kresources/akonadi/kcal/CMakeLists.txt
+@@ -9,7 +9,7 @@
  
--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 @@
+ kde4_add_plugin(kcal_akonadi ${kcal_akonadi_SRCS})
  
- add_dependencies(korganizerprivate kmail)
+-target_link_libraries(kcal_akonadi ${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS} akonadi-kcal)
++target_link_libraries(kcal_akonadi ${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KRESOURCES_LIBRARY} ${KDE4_KABC_LIBRARY} akonadi-kcal)
  
--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 )
  
---- a/kontact/plugins/summary/CMakeLists.txt
-+++ b/kontact/plugins/summary/CMakeLists.txt
-@@ -12,7 +12,7 @@
-    add_dependencies(kontact_summaryplugin kmail_xml)
- endif(KMAIL_SUPPORTED)
+ install(TARGETS kcal_akonadi  DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- a/kresources/groupwise/soap/CMakeLists.txt
++++ b/kresources/groupwise/soap/CMakeLists.txt
+@@ -26,7 +26,7 @@
+    )
  
--kdepim4_link_unique_libraries(kontact_summaryplugin ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} kontactinterfaces kdepim)
-+kdepim4_link_unique_libraries(kontact_summaryplugin ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} kontactinterfaces kdepim ${KDE4_KDEUI_LIBS} )
+ kde4_add_library(gwsoap SHARED ${gwsoap_SRCS})
+-target_link_libraries(gwsoap ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS})
++target_link_libraries(gwsoap ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+ set_target_properties(gwsoap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS gwsoap DESTINATION ${LIB_INSTALL_DIR})
  
- ########### next target ###############
+--- a/strigi-analyzer/vcf/CMakeLists.txt
++++ b/strigi-analyzer/vcf/CMakeLists.txt
+@@ -6,6 +6,6 @@
  
-@@ -20,7 +20,7 @@
+ kde4_add_library(vcf MODULE ${vcfendanalyzer_SRCS})
  
- kde4_add_plugin(kcm_kontactsummary ${kcm_kontactsummary_PART_SRCS})
- 
--kdepim4_link_unique_libraries(kcm_kontactsummary  ${KDE4_KUTILS_LIBS})
-+kdepim4_link_unique_libraries(kcm_kontactsummary  ${KDE4_KUTILS_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KIO_LIBS})
- 
- ########### install files ###############
- 
+-target_link_libraries(vcf ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KABC_LIBS})
++target_link_libraries(vcf ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KABC_LIBS} ${QT_QTCORE_LIBRARY})
+ set_target_properties(vcf PROPERTIES PREFIX strigiea_)
+ install(TARGETS vcf LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)

Modified: branches/kde4/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/series	2008-09-01 19:15:11 UTC (rev 12031)
+++ branches/kde4/packages/kdepim/debian/patches/series	2008-09-01 21:19:36 UTC (rev 12032)
@@ -1,2 +1,4 @@
+01_reenable_strigi.diff
+02_fix_akonadi_feeders.diff
 30_debianize_akregator_default.diff
 97_fix_target_link_libraries.diff




More information about the pkg-kde-commits mailing list