Branch 'libkolab-0.2' - 2 commits - CMakeLists.txt conversion/commonconversion.h conversion/kabcconversion.h conversion/kcalconversion.h conversion/kolabconversion.h kolabformat/errorhandler.cpp kolabformat/kolabobject.cpp RELEASE-NOTES tests/benchmark.cpp tests/formattest.cpp tests/kcalconversiontest.cpp tests/upgradetest.cpp

[Christian Mollekopf]

 CMakeLists.txt                |    2 +-
 RELEASE-NOTES                 |    2 ++
 conversion/commonconversion.h |    2 +-
 conversion/kabcconversion.h   |    2 +-
 conversion/kcalconversion.h   |    6 +++---
 conversion/kolabconversion.h  |    2 +-
 kolabformat/errorhandler.cpp  |    2 +-
 kolabformat/kolabobject.cpp   |    2 +-
 tests/benchmark.cpp           |    2 +-
 tests/formattest.cpp          |    4 ++--
 tests/kcalconversiontest.cpp  |    2 +-
 tests/upgradetest.cpp         |    4 ++--
 12 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 662675e0f407939f27570c1a8d4f407187208e29
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Jul 19 18:38:33 2012 +0200

    prepare for 0.2.2 release

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c3483f..5cb9077 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${Libkolab_MODULE_DIR})
 
 set(Libkolab_VERSION_MAJOR 0)
 set(Libkolab_VERSION_MINOR 2)
-set(Libkolab_VERSION_PATCH 1)
+set(Libkolab_VERSION_PATCH 2)
 set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH} )
 set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f280842..1aeb88d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
 
+== 0.2.2 ==
+* Fixed includes to work with libkolabxml 0.7.0
 == 0.2.1 ==
 * Included the proper COPYING files
\ No newline at end of file


commit 778942a607ee2e27a2fcfb16369e80b7ca34a5f2
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Jul 19 15:29:07 2012 +0200

    Fix includes to work with more recent libkolabxml versions.

diff --git a/conversion/commonconversion.h b/conversion/commonconversion.h
index 049e8ae..301e54a 100644
--- a/conversion/commonconversion.h
+++ b/conversion/commonconversion.h
@@ -20,7 +20,7 @@
 
 #include <KDE/KDateTime>
 #include <QStringList>
-#include <kolab/kolabcontainers.h>
+#include <kolabcontainers.h>
 
 
 namespace Kolab {
diff --git a/conversion/kabcconversion.h b/conversion/kabcconversion.h
index 6430097..1e87f66 100644
--- a/conversion/kabcconversion.h
+++ b/conversion/kabcconversion.h
@@ -20,7 +20,7 @@
 
 #include "kolab_export.h"
 
-#include <kolab/kolabcontact.h>
+#include <kolabcontact.h>
 #include <kabc/addressee.h>
 #include <kabc/contactgroup.h>
 
diff --git a/conversion/kcalconversion.h b/conversion/kcalconversion.h
index 706059c..1f8c8df 100644
--- a/conversion/kcalconversion.h
+++ b/conversion/kcalconversion.h
@@ -20,9 +20,9 @@
 
 #include "kolab_export.h"
 
-#include <kolab/kolabevent.h>
-#include <kolab/kolabtodo.h>
-#include <kolab/kolabjournal.h>
+#include <kolabevent.h>
+#include <kolabtodo.h>
+#include <kolabjournal.h>
 #include <kcalcore/event.h>
 #include <kcalcore/todo.h>
 #include <kcalcore/journal.h>
diff --git a/conversion/kolabconversion.h b/conversion/kolabconversion.h
index cae08fc..387de90 100644
--- a/conversion/kolabconversion.h
+++ b/conversion/kolabconversion.h
@@ -20,7 +20,7 @@
 
 #include "kolab_export.h"
 
-#include <kolab/kolabnote.h>
+#include <kolabnote.h>
 #include <kmime/kmime_message.h>
 
 namespace Kolab {
diff --git a/kolabformat/errorhandler.cpp b/kolabformat/errorhandler.cpp
index 19817ad..4fc5147 100644
--- a/kolabformat/errorhandler.cpp
+++ b/kolabformat/errorhandler.cpp
@@ -20,7 +20,7 @@
 
 #include <qdebug.h>
 
-#include <kolab/kolabformat.h>
+#include <kolabformat.h>
 
 namespace Kolab {
     
diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
index a0bcc03..1f154ce 100644
--- a/kolabformat/kolabobject.cpp
+++ b/kolabformat/kolabobject.cpp
@@ -34,7 +34,7 @@
 #include <conversion/kabcconversion.h>
 #include <conversion/kolabconversion.h>
 #include <akonadi/notes/noteutils.h>
-#include <kolab/kolabformat.h>
+#include <kolabformat.h>
 
 
 namespace Kolab {
diff --git a/tests/benchmark.cpp b/tests/benchmark.cpp
index af11c85..28bf8d7 100644
--- a/tests/benchmark.cpp
+++ b/tests/benchmark.cpp
@@ -19,7 +19,7 @@
 #include "kolabformatV2/event.h"
 #include "conversion/kcalconversion.h"
 #include <kmime/kmime_message.h>
-#include <kolab/kolabformat.h>
+#include <kolabformat.h>
 #include <kdebug.h>
 #include "testutils.h"
 
diff --git a/tests/formattest.cpp b/tests/formattest.cpp
index 051901f..d92ebb1 100644
--- a/tests/formattest.cpp
+++ b/tests/formattest.cpp
@@ -24,8 +24,8 @@
 #include <qtemporaryfile.h>
 #include <QBuffer>
 #include <kdebug.h>
-#include <kolab/kolabcontainers.h>
-#include <kolab/kolabformat.h>
+#include <kolabcontainers.h>
+#include <kolabformat.h>
 
 #include <kcalcore/icalformat.h>
 #include <kabc/vcardconverter.h>
diff --git a/tests/kcalconversiontest.cpp b/tests/kcalconversiontest.cpp
index cbb9cbd..c9fa518 100644
--- a/tests/kcalconversiontest.cpp
+++ b/tests/kcalconversiontest.cpp
@@ -21,7 +21,7 @@
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
 #include <KDE/KSystemTimeZones>
-#include <kolab/kolabcontact.h>
+#include <kolabcontact.h>
 #include <kcalcore/recurrence.h>
 #include <kabc/addressee.h>
 
diff --git a/tests/upgradetest.cpp b/tests/upgradetest.cpp
index 5b06b39..3d692ad 100644
--- a/tests/upgradetest.cpp
+++ b/tests/upgradetest.cpp
@@ -19,8 +19,8 @@
 #include "upgradetest.h"
 
 #include <QTest>
-#include <kolab/kolabcontainers.h>
-#include <kolab/kolabformat.h>
+#include <kolabcontainers.h>
+#include <kolabformat.h>
 
 #include "testutils.h"
 #include "kolabformat/kolabobject.h"