cmake/modules fbdaemon/authenticationjob.cpp fbdaemon/fbaggregatorjob.cpp jobs/findkolabfoldersjob.cpp jobs/messagemodifyjob.cpp upgradetool/imapupgradejob.cpp upgradetool/imapupgradejob.h upgradetool/kolabformatupgradejob.cpp

[Christian Mollekopf]

 cmake/modules/FindLibcalendaring.cmake |    4 ++--
 fbdaemon/authenticationjob.cpp         |    2 +-
 fbdaemon/fbaggregatorjob.cpp           |    1 -
 jobs/findkolabfoldersjob.cpp           |    2 +-
 jobs/messagemodifyjob.cpp              |    2 +-
 upgradetool/imapupgradejob.cpp         |    2 +-
 upgradetool/imapupgradejob.h           |    2 +-
 upgradetool/kolabformatupgradejob.cpp  |    2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit a250289627748a54687123bdc574e694e56f3978
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Jul 20 07:44:19 2012 -0400

    fix calendaring build

diff --git a/cmake/modules/FindLibcalendaring.cmake b/cmake/modules/FindLibcalendaring.cmake
index 3c4c860..4b5dfd5 100644
--- a/cmake/modules/FindLibcalendaring.cmake
+++ b/cmake/modules/FindLibcalendaring.cmake
@@ -10,9 +10,9 @@ find_library(CALENDARING_NOTES NAMES calendaring-akonadi-notes)
 find_library(CALENDARING_KCALUTILS NAMES calendaring-kcalutils)
 find_library(CALENDARING_KPIMUTILS NAMES calendaring-kpimutils)
 
-find_path(CALENDARING_INCLUDE_DIRS NAMES libcalendaring/kdatetime.h)
+find_path(CALENDARING_INCLUDE_DIRS NAMES calendaring/kdatetime.h)
 
-set( Libcalendaring_INCLUDE_DIRS "${CALENDARING_INCLUDE_DIRS}/libcalendaring" )
+set( Libcalendaring_INCLUDE_DIRS "${CALENDARING_INCLUDE_DIRS}/calendaring" )
 
 set( Libcalendaring_LIBRARIES ${CALENDARING_KDECORE} ${CALENDARING_KCALCORE} ${CALENDARING_KMIME} ${CALENDARING_KIMAP} ${CALENDARING_KABC} ${CALENDARING_NOTES} ${CALENDARING_KCALUTILS} ${CALENDARING_KPIMUTILS})
 
diff --git a/fbdaemon/authenticationjob.cpp b/fbdaemon/authenticationjob.cpp
index 77e5921..0fcf436 100644
--- a/fbdaemon/authenticationjob.cpp
+++ b/fbdaemon/authenticationjob.cpp
@@ -18,7 +18,7 @@
 #include "authenticationjob.h"
 #include "settings.h"
 #include <kimap/loginjob.h>
-#include <KDE/KDebug>
+#include <kdebug.h>
 #include <qsettings.h>
 
 AuthenticationJob::AuthenticationJob(const QString &userName, KIMAP::Session *session, QObject* parent)
diff --git a/fbdaemon/fbaggregatorjob.cpp b/fbdaemon/fbaggregatorjob.cpp
index c8cbefc..ad81c7c 100644
--- a/fbdaemon/fbaggregatorjob.cpp
+++ b/fbdaemon/fbaggregatorjob.cpp
@@ -19,7 +19,6 @@
 #include "settings.h"
 #include "jobs/probekolabserverjob.h"
 #include <jobs/fetchmessagesjob.h>
-#include </home/chrigi/work/kolab/xmlformat/libkolab/freebusy/freebusy.h>
 #include <kdebug.h>
 #include <QFile>
 #include <QDir>
diff --git a/jobs/findkolabfoldersjob.cpp b/jobs/findkolabfoldersjob.cpp
index 9e4081a..fe8fecc 100644
--- a/jobs/findkolabfoldersjob.cpp
+++ b/jobs/findkolabfoldersjob.cpp
@@ -22,7 +22,7 @@
 #include <kimap/session.h>
 #include <kimap/metadatajobbase.h>
 #include <kimap/getmetadatajob.h>
-#include <KDE/KDebug>
+#include <kdebug.h>
 #include <boost/concept_check.hpp>
 #include <kolabdefinitions.h>
 
diff --git a/jobs/messagemodifyjob.cpp b/jobs/messagemodifyjob.cpp
index 2c549ff..faf70c4 100644
--- a/jobs/messagemodifyjob.cpp
+++ b/jobs/messagemodifyjob.cpp
@@ -23,7 +23,7 @@
 #include <kimap/appendjob.h>
 #include <kimap/selectjob.h>
 #include <kimap/storejob.h>
-#include <KDE/KDebug>
+#include <kdebug.h>
 
 const char* FlagDeleted = "\\Deleted";
 
diff --git a/upgradetool/imapupgradejob.cpp b/upgradetool/imapupgradejob.cpp
index cf87923..cacf25c 100644
--- a/upgradetool/imapupgradejob.cpp
+++ b/upgradetool/imapupgradejob.cpp
@@ -34,7 +34,7 @@
 // #include <kio/sslui.h>
 
 #include <kmime/kmime_message.h>
-#include <KDE/KDebug>
+#include <kdebug.h>
 
 ImapUpgradeJob::ImapUpgradeJob(QObject* parent): KJob(parent),
 m_session(0)
diff --git a/upgradetool/imapupgradejob.h b/upgradetool/imapupgradejob.h
index e6572e8..9b54be8 100644
--- a/upgradetool/imapupgradejob.h
+++ b/upgradetool/imapupgradejob.h
@@ -22,7 +22,7 @@
 #define IMAPUPGRADER_H
 #include <QObject>
 #include <QStringList>
-#include <KDE/KJob>
+#include <kjob.h>
 #include <kimap/session.h>
 #include <kimap/loginjob.h>
 
diff --git a/upgradetool/kolabformatupgradejob.cpp b/upgradetool/kolabformatupgradejob.cpp
index 576bb4b..dcddd9f 100644
--- a/upgradetool/kolabformatupgradejob.cpp
+++ b/upgradetool/kolabformatupgradejob.cpp
@@ -29,7 +29,7 @@
 #include <kimap/expungejob.h>
 
 #include <QStringList>
-#include <KDE/KDebug>
+#include <kdebug.h>
 
 KolabFormatUpgradeJob::KolabFormatUpgradeJob(const QString& folder, KIMAP::Session* session, QObject* parent)
 :   KJob(parent),