SVN commit 918155 by winterz:

Move kdepim/libkholidays into kdepimlibs/kholidays.
All licensing issues have been resolved to make this move happen.

a few dpointer issues and more apidox are still needed but i'll
get to that soon.

Please update your kdepimlibs installation before attempting to update kdepim.

CCMAIL: kde-pim@kde.org


 M  +0 -1      kdepim/CMakeLists.txt  
 M  +1 -1      kdepim/kalarm/CMakeLists.txt  
 M  +1 -1      kdepim/kalarm/alarmevent.cpp  
 M  +1 -1      kdepim/kalarm/functions.cpp  
 M  +1 -1      kdepim/kalarm/prefdlg.cpp  
 M  +1 -1      kdepim/kalarm/preferences.cpp  
 M  +1 -1      kdepim/kontact/plugins/planner/CMakeLists.txt  
 M  +0 -1      kdepim/kontact/plugins/planner/planner.cpp  
 M  +1 -1      kdepim/kontact/plugins/planner/planner.h  
 M  +1 -1      kdepim/kontact/plugins/specialdates/CMakeLists.txt  
 M  +1 -1      kdepim/kontact/plugins/specialdates/sdsummarywidget.h  
 M  +1 -2      kdepim/korganizer/CMakeLists.txt  
 M  +1 -1      kdepim/korganizer/calendarview.cpp  
 M  +3 -2      kdepim/korganizer/koglobals.cpp  
 M  +1 -1      kdepim/korganizer/koprefsdialog.cpp  
 M  +2 -1      kdepim/korganizer/timelabels.cpp  
 M  +1 -1      kdepim/korganizer/views/agendaview/koagendaview.cpp  
 D             kdepim/libkholidays (directory)  
 M  +1 -1      kdepimlibs/CMakeLists.txt  


--- trunk/KDE/kdepim/CMakeLists.txt #918154:918155
@@ -122,7 +122,6 @@
   add_subdirectory(kode)
   macro_optional_add_subdirectory(akonadi)
   add_subdirectory(libkdepim)
-  add_subdirectory(libkholidays)
   add_subdirectory(kontactinterfaces)
 
   find_path(TOPOLOGICAL_SORT_DIR NAMES boost/graph/topological_sort.hpp PATHS ${Boost_INCLUDE_DIRS})
--- trunk/KDE/kdepim/kalarm/CMakeLists.txt #918154:918155
@@ -111,7 +111,7 @@
 
 set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm)
 
-target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_MAILTRANSPORT_LIBS} ${KDE4_PHONON_LIBS} kdepim kholidays)
+target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_MAILTRANSPORT_LIBS} ${KDE4_KHOLIDAYS_LIBS} ${KDE4_PHONON_LIBS} kdepim)
 
 
 install(TARGETS kalarm_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/KDE/kdepim/kalarm/alarmevent.cpp #918154:918155
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 
 #include <kcal/calendarlocal.h>
-#include <libkholidays/kholidays.h>
+#include <kholidays/kholidays.h>
 
 using namespace KCal;
 using namespace LibKHolidays;
--- trunk/KDE/kdepim/kalarm/functions.cpp #918154:918155
@@ -61,7 +61,7 @@
 #include <kpimidentities/identitymanager.h>
 #include <kpimidentities/identity.h>
 #include <kcal/person.h>
-#include <libkholidays/kholidays.h>
+#include <kholidays/kholidays.h>
 #include <ktoolinvocation.h>
 
 
--- trunk/KDE/kdepim/kalarm/prefdlg.cpp #918154:918155
@@ -84,7 +84,7 @@
 #include <kdebug.h>
 
 #include <ktoolinvocation.h>
-#include <libkholidays/kholidays.h>
+#include <kholidays/kholidays.h>
 using namespace LibKHolidays;
 
 static const char PREF_DIALOG_NAME[] = "PrefDialog";
--- trunk/KDE/kdepim/kalarm/preferences.cpp #918154:918155
@@ -33,7 +33,7 @@
 
 #include <kpimidentities/identity.h>
 #include <kpimidentities/identitymanager.h>
-#include <libkholidays/kholidays.h>
+#include <kholidays/kholidays.h>
 using namespace LibKHolidays;
 
 #include "functions.h"
--- trunk/KDE/kdepim/kontact/plugins/planner/CMakeLists.txt #918154:918155
@@ -10,7 +10,7 @@
 
 kde4_add_plugin(kontact_plannerplugin ${kontact_plannerplugin_PART_SRCS})
 
-target_link_libraries(kontact_plannerplugin  ${KDE4_KDECORE_LIBS} kontactinterfaces kdepim kholidays korganizer_calendar kaddressbookprivate ${KDE4_KCAL_LIBS})
+target_link_libraries(kontact_plannerplugin  ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_KHOLIDAYS_LIBS} kontactinterfaces kdepim korganizer_calendar kaddressbookprivate)
 
 ########### next target ###############
 
--- trunk/KDE/kdepim/kontact/plugins/planner/planner.cpp #918154:918155
@@ -32,7 +32,6 @@
 #include <kontactinterfaces/core.h>
 #include <kontactinterfaces/plugin.h>
 #include <libkdepim/kpimprefs.h>
-#include <libkholidays/kholidays.h>
 
 #include <kabc/stdaddressbook.h>
 #include <kabc/addressee.h>
--- trunk/KDE/kdepim/kontact/plugins/planner/planner.h #918154:918155
@@ -26,7 +26,7 @@
 #define PLANNERWIDGET_H
 
 #include <kontactinterfaces/summary.h>
-#include <libkholidays/kholidays.h>
+#include <kholidays/kholidays.h>
 
 #include <kabc/resource.h>
 #include <kcal/calendarresources.h>
--- trunk/KDE/kdepim/kontact/plugins/specialdates/CMakeLists.txt #918154:918155
@@ -7,7 +7,7 @@
 
 kde4_add_plugin(kontact_specialdatesplugin ${kontact_specialdatesplugin_PART_SRCS})
 
-target_link_libraries(kontact_specialdatesplugin  ${KDE4_KDEUI_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS} kontactinterfaces kdepim kholidays korganizer_calendar kaddressbookprivate)
+target_link_libraries(kontact_specialdatesplugin  ${KDE4_KDEUI_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KHOLIDAYS_LIBS} kontactinterfaces kdepim korganizer_calendar kaddressbookprivate)
 
 
 ########### next target ###############
--- trunk/KDE/kdepim/kontact/plugins/specialdates/sdsummarywidget.h #918154:918155
@@ -27,7 +27,7 @@
 #define SDSUMMARYWIDGET_H
 
 #include <kontactinterfaces/summary.h>
-#include <libkholidays/kholidays.h>
+#include <kholidays/kholidays.h>
 
 namespace Kontact {
   class Plugin;
--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #918154:918155
@@ -22,7 +22,6 @@
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5850)
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
-                     ${CMAKE_SOURCE_DIR}/libkholidays
                      ${CMAKE_SOURCE_DIR}/mimelib
                      ${CMAKE_SOURCE_DIR}/korganizer/printing
                      ${CMAKE_SOURCE_DIR}/kdgantt1
@@ -66,7 +65,7 @@
 
 kde4_add_plugin(kcm_korganizer ${kcm_korganizer_PART_SRCS})
 
-target_link_libraries(kcm_korganizer ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KCAL_LIBS} korganizerprivate kdepim kholidays korganizer_core korganizer_calendar)
+target_link_libraries(kcm_korganizer ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_KHOLIDAYS_LIBS} korganizerprivate kdepim korganizer_core korganizer_calendar)
 
 install(TARGETS kcm_korganizer  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/KDE/kdepim/korganizer/calendarview.cpp #918154:918155
@@ -56,7 +56,6 @@
 #include "exportwebdialog.h"
 #include "kocorehelper.h"
 #include "incidencechanger.h"
-#include "kholidays.h"
 #include "mailscheduler.h"
 #include "komailclient.h"
 #include "views/agendaview/koagendaview.h"
@@ -79,6 +78,7 @@
 #include <kcal/calendarresources.h>
 #include <kcal/calendarnull.h>
 #include <kcal/htmlexportsettings.h>
+#include <kholidays/kholidays.h>
 
 #include <kglobal.h>
 #include <kdebug.h>
--- trunk/KDE/kdepim/korganizer/koglobals.cpp #918154:918155
@@ -28,6 +28,9 @@
 
 #include <libkdepim/reminderclient.h>
 
+#include <kholidays/kholidays.h>
+using namespace LibKHolidays;
+
 #include <k3staticdeleter.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -38,8 +41,6 @@
 #include <kiconloader.h>
 #include <kcomponentdata.h>
 #include <kcalendarsystem.h>
-#include <kholidays.h>
-using namespace LibKHolidays;
 
 #include <Q3ValueList>
 #include <QApplication>
--- trunk/KDE/kdepim/korganizer/koprefsdialog.cpp #918154:918155
@@ -31,7 +31,7 @@
 #include "calendar/calendardecoration.h"
 #include "korganizer/printplugin.h"
 
-#include <kholidays.h>
+#include <kholidays/kholidays.h>
 using namespace LibKHolidays;
 
 #include <kcal/calendarresources.h>
--- trunk/KDE/kdepim/korganizer/timelabels.cpp #918154:918155
@@ -36,6 +36,8 @@
 #include "views/agendaview/koagendaitem.h"
 #include "views/agendaview/koagenda.h"
 
+#include <kholidays/kholidays.h>
+
 #include <kapplication.h>
 #include <kcalendarsystem.h>
 #include <kdebug.h>
@@ -45,7 +47,6 @@
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kholidays.h>
 #include <KVBox>
 #include <ksystemtimezone.h>
 #include <kpushbutton.h>
--- trunk/KDE/kdepim/korganizer/views/agendaview/koagendaview.cpp #918154:918155
@@ -43,6 +43,7 @@
 #include <kcal/calfilter.h>
 #include <kcal/incidence.h>
 #include <kcal/incidenceformatter.h>
+#include <kholidays/kholidays.h>
 
 #include <kapplication.h>
 #include <kcalendarsystem.h>
@@ -53,7 +54,6 @@
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kholidays.h>
 #include <kvbox.h>
 #include <ksystemtimezone.h>
 #include <kpushbutton.h>
--- trunk/KDE/kdepimlibs/CMakeLists.txt #918154:918155
@@ -54,7 +54,7 @@
 add_subdirectory(kabc)
 add_subdirectory(kblog)
 add_subdirectory(kcal)
-#add_subdirectory(kholidays)
+add_subdirectory(kholidays)
 add_subdirectory(kimap)
 add_subdirectory(kldap)
 add_subdirectory(kpimidentities)
_______________________________________________
KDE PIM mailing list kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/