Request 3007 (accepted)

libkolab.spec Changed

0001-KF5CoreAddons-is-no-longer-required.patch Deleted

debian.changelog Changed

debian.control Changed

@@ -6,10 +6,8 @@
 Build-Depends:
 	cmake,
 	debhelper,
+    dh-python,
 	libcurl4-gnutls-dev,
-	libboost-dev,
-	libboost-thread-dev,
-	libboost-system-dev,
 	libkolabxml-dev (>= 1.0),
 	libossp-uuid-dev,
     qtbase5-dev,
@@ -25,7 +23,9 @@
 	plesk-php73-dev | bash,
 	plesk-php74-dev | bash,
 	psa | bash,
-	python-dev,
+    python2-dev | python-dev,
+    python-minimal | python2-minimal,
+    python3-all-dev,
 	swig (>= 2.0)
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.3
@@ -69,7 +69,20 @@
 Architecture: any
 Section: python
 Depends: libkolab3 (= ${binary:Version}),
-	python,
+	${python:Depends},
+	${misc:Depends},
+	${shlibs:Depends}
+Conflicts: python-kolab-kde
+Description: Python bindings for Kolab Library
+ This package provides the Kolab Python module calendaring.
+ .
+  - The calendaring module provides some general calendaring functions
+
+Package: python2-kolab
+Architecture: any
+Section: python
+Depends: libkolab3 (= ${binary:Version}),
+	${python3:Depends},
 	${misc:Depends},
 	${shlibs:Depends}
 Conflicts: python-kolab-kde

debian.rules Changed

@@ -4,7 +4,6 @@
 PHPBIN := $(shell php-config --php-binary)
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
-PYTHON_SITEARCH := $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
 
 PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6
 
@@ -14,7 +13,7 @@
 export DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed"
 
 %:
-	dh $@ --parallel --with python2
+	dh $@ --parallel --with python2,python3 --buildsystem=pybuild
 
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolab.substvars
@@ -43,6 +42,7 @@
 	dh_gencontrol
 
 override_dh_auto_build:
+	# Build plesk php versions
 	if  -f /etc/plesk-release  ; then \
 		for version in $(PHP_VERSIONS) ; do \
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
@@ -53,19 +53,25 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
 			fi ; \
-			dh_auto_build --builddirectory php-$${version} ; \
+			dh_auto_build --buildsystem cmake --builddirectory php-$${version} ; \
 		done ; \
 	fi
 
+	# Build php vanilla
 	if  $$(php-config --vernum) -gt 70000 ; then \
 		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
 	else \
 		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
 	fi
 
+	dh_auto_build --buildsystem cmake --builddirectory php-vanilla
+
+	# Build python versions via pybuild
 	dh_auto_build
 
 override_dh_auto_configure:
+	echo 9 > debian/compat
+	# Configure plesk php version
 	if  -f /etc/plesk-release  ; then \
 		for version in $(PHP_VERSIONS) ; do \
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
@@ -76,9 +82,9 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
 			fi ; \
-			dh_auto_configure --builddirectory php-$${version} -- \
+			dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- \
 				-DLIB_INSTALL_DIR=/usr/lib \
-                -DBoost_NO_BOOST_CMAKE=TRUE \
+                -DBoost_NO_BOOST_CMAKE=ON \
 				-DSWIG=/usr/bin/swig \
 				-DPHP_BINDINGS=ON \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
@@ -89,27 +95,35 @@
 		done ; \
 	fi
 
+	# Configure php vanilla
 	if  $$(php-config --vernum) -gt 70000 ; then \
 		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
 	else \
 		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
 	fi
 
-	dh_auto_configure -- \
+	dh_auto_configure --buildsystem cmake --builddirectory php-vanilla -- \
 		-DLIB_INSTALL_DIR=/usr/lib \
-        -DBoost_NO_BOOST_CMAKE=TRUE \
-		-DPHP_BINDINGS=ON \
+		-DBoost_NO_BOOST_CMAKE=ON \
+	    -DSWIG=/usr/bin/swig \
+	    -DPHP_BINDINGS=ON \
 		-DPHP_INSTALL_DIR=$(PHPEXT) \
 		-DPHP_EXECUTABLE=$(PHPBIN) \
-		-DPHP_INCLUDE_DIR=$(PHPINC) \
+		-DPHP_INCLUDE_DIR=$(PHPINC)
+
+	# Configure python builds via pybuild
+	dh_auto_configure -- --configure-args \
+		"-DLIB_INSTALL_DIR=/usr/lib \
+        -DBoost_NO_BOOST_CMAKE=ON \
 		-DPYTHON_BINDINGS=ON \
-		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
+		-DPYTHON_INSTALL_DIR={install_dir}"
 
 override_dh_install:
 	# Install the PHP modules manually, because they depend on PHP the API version,
 	# which has to be determined dynamically, so we can't put it into an .install file.
 	mkdir -p debian/tmp/usr/share/php
-	mv debian/tmp/$(PHPEXT)/*.php debian/tmp/usr/share/php/.
+	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
+	mv debian/tmp/$(PHPEXT)/*.php debian/tmp/usr/share/php/ || exit 1.
 	echo "$(PHPEXT)" >> debian/php-kolab.install
 
 	# Put kolab.ini into place
@@ -129,7 +143,9 @@
 		echo "debian/kolab.ini etc/php5/mods-available" >> debian/php-kolab.install ; \
 	fi
 
-	touch debian/tmp/$(PYTHON_SITEARCH)/kolab/__init__.py
+	for i in debian/tmp/usr/lib/python*/dist-packages/kolab ; do \
+		touch $${i}/__init__.py; \
+	done
 
 	if  -f /etc/plesk-release ; then \
 		for version in $(PHP_VERSIONS) ; do \
@@ -147,7 +163,7 @@
 			mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/ ; \
 			cp -a debian/kolab.ini debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \
 			mv debian/plesk-php$${shver}-kolab$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolab*.php \
-				debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/. ; \
+				debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/. || exit 1; \
 			rm -rf debian/plesk-php$${shver}-kolab/usr/ ; \
 		done ; \
 	fi

debian.tar.gz/python-kolab.install Changed

debian.tar.gz/python3-kolab.install Added

libkolab-3.0.1.tar.gz/CMakeLists.txt -> libkolab-3.0.2.tar.gz/CMakeLists.txt Changed

libkolab-3.0.1.tar.gz/calendaring/event.cpp -> libkolab-3.0.2.tar.gz/calendaring/event.cpp Changed

@@ -19,14 +19,19 @@
 #include "event.h"
 
 #include <QDebug>
+#include <QTimeZone>
 
 #include <conversion/kcalconversion.h>
 #include <conversion/commonconversion.h>
+#include <kcalcore/memorycalendar.h>
+#include <kcalcore/icalformat.h>
 
 #include <iostream>
 #include <kolabformat.h>
 #include <kolabevent_p.h>
 
+#include "libkolab-version.h"
+
 
 namespace Kolab {
     namespace Calendaring {
@@ -149,12 +154,10 @@
 cDateTime Calendaring::Event::getNextOccurence(const cDateTime &date)
 {
     KCalCore::Event::Ptr event = Kolab::Conversion::toKCalCore(*this);
-    qWarning() << "Converted start " << event->dtStart() << Kolab::Conversion::toDate(date);
     if (!event->recurs()) {
         return cDateTime();
     }
     const QDateTime nextDate = event->recurrence()->getNextDateTime(Kolab::Conversion::toDate(date));
-    qWarning() << "Next date " << nextDate;
     return Kolab::Conversion::fromDate(nextDate);
 }
 
@@ -176,6 +179,80 @@
     return Kolab::Conversion::fromDate(endDate);
 }
 
+static std::vector< Kolab::Event > fromICalEvents(const std::string &input)
+{
+    KCalCore::Calendar::Ptr calendar(new KCalCore::MemoryCalendar(QTimeZone::utc()));
+    KCalCore::ICalFormat format;
+    format.setApplication("libkolab", LIBKOLAB_LIB_VERSION_STRING);
+    format.fromString(calendar, Conversion::fromStdString(input));
+    std::vector<Kolab::Event> events;
+    QMap< QString, int > uidMap;
+    foreach (const KCalCore::Event::Ptr &event, calendar->events()) {
+        Kolab::Event e = Conversion::fromKCalCore(*event);
+        if (!e.recurrenceID().isValid()) {
+            if (uidMap.contains(event->uid())) {
+                e.setExceptions(events.at(uidMapevent->uid()).exceptions());
+                eventsuidMapevent->uid() = e;
+            } else {
+                events.push_back(e);
+                uidMap.insert(event->uid(), events.size()-1);
+            }
+        } else {
+            if (!uidMap.contains(event->uid())) {
+                Kolab::Event e;
+                e.setUid("");
+                events.push_back(e);
+                uidMap.insert(event->uid(), events.size()-1);
+            }
+            std::vector<Kolab::Event> exceptions = events.at( uidMapevent->uid()).exceptions();
+            exceptions.push_back(e);
+            events.at(uidMapevent->uid()).setExceptions(exceptions);
+        }
+    }
+    return events;
+}
+
+static std::string eventsToICal(const std::vector<Kolab::Event> &events)
+{
+    KCalCore::Calendar::Ptr calendar(new KCalCore::MemoryCalendar(QTimeZone::utc()));
+    foreach (const Kolab::Event &event, events) {
+        KCalCore::Event::Ptr kcalEvent = Conversion::toKCalCore(event);
+        if (!kcalEvent->created().isValid()) {
+            kcalEvent->setCreated(QDateTime::currentDateTime()); //sets dtstamp
+        }
+        calendar->addEvent(kcalEvent);
+        foreach(const Kolab::Event &exception, event.exceptions()) {
+            KCalCore::Event::Ptr kcalException = Conversion::toKCalCore(exception);
+            if (!kcalException->created().isValid()) {
+                kcalException->setCreated(QDateTime::currentDateTime()); //sets dtstamp
+            }
+            calendar->addEvent(kcalException);
+        }
+    }
+    KCalCore::ICalFormat format;
+    format.setApplication("libkolab", LIBKOLAB_LIB_VERSION_STRING);
+//     qDebug() << format.createScheduleMessage(calendar->events().first(), KCalCore::iTIPRequest);
+    return Conversion::toStdString(format.toString(calendar));
+
+}
+
+std::string Event::toICal() const
+{
+    std::vector<Kolab::Event> list;
+    list.push_back(*this);
+    return eventsToICal(list);
+}
+
+bool Event::fromICal(const std::string &input)
+{
+    std::vector<Kolab::Event> list = fromICalEvents(input);
+    if (list.size() != 1) {
+        std::cout << "invalid number of events: " << list.size();
+        return false;
+    }
+    Kolab::Event::operator=(list.at(0));
+    return true;
+}
 
     };
 };

libkolab-3.0.1.tar.gz/calendaring/event.h -> libkolab-3.0.2.tar.gz/calendaring/event.h Changed

libkolab-3.0.1.tar.gz/conversion/commonconversion.cpp -> libkolab-3.0.2.tar.gz/conversion/commonconversion.cpp Changed

@@ -64,18 +64,14 @@
     date.setDate(QDate(dt.year(), dt.month(), dt.day()));
     date.setTime(QTime(dt.hour(), dt.minute(), dt.second()));
     if (dt.isUTC()) {
-        qWarning() << "Converting utc";
         date.setTimeSpec(Qt::UTC);
         // date.setTimeZone(QTimeZone::utc());
     } else if (!dt.timezone().empty()) {
-        qWarning() << "Converting timezone";
         date.setTimeZone(getTimeSpec(dt.timezone()));
     } else {
-        qWarning() << "Converting localtime";
         date.setTimeSpec(Qt::LocalTime);
         //We apparently can't have what used to be called floating time, so set the timezone to utc.
         // date.setTimeZone(QTimeZone::utc());
-        qWarning() << "Converting localtime" << date.timeZone();
     }
     // Q_ASSERT(date.timeSpec().isValid());
     Q_ASSERT(date.isValid());
@@ -84,15 +80,12 @@
 
 cDateTime fromDate(const QDateTime &dt)
 {
-    qWarning() << dt;
     if (!dt.isValid()) {
         //         qDebug() << "invalid datetime converted";
         return cDateTime();
     }
-    qWarning() << "From " << dt;
     cDateTime date;
     if (!dt.time().isValid()) { //Date only
-        qWarning() << "invalid datetime";
         const QDate &d = dt.date();
         date.setDate(d.year(), d.month(), d.day());
     } else {
@@ -102,7 +95,6 @@
         date.setTime(t.hour(), t.minute(), t.second());
         if (dt.timeSpec() == Qt::UTC) { //UTC
             date.setUTC(true);
-            qWarning() << "From utc";
         } else if (dt.timeSpec() == Qt::OffsetFromUTC) {
             const QDateTime utcDate = dt.toUTC();
             const QDate &d = utcDate.date();
@@ -111,7 +103,6 @@
             date.setTime(t.hour(), t.minute(), t.second());
             date.setUTC(true);
         } else if (dt.timeSpec() == Qt::TimeZone) { //Timezone
-            qWarning() << "From timezone";
             //Not actually a timezone
             // if (dt.timeZone().id().toLower() == "utc") {
             //     date.setUTC(true);
@@ -126,7 +117,6 @@
                 }
             // }
         } else if (dt.timeSpec() != Qt::LocalTime) {
-            qWarning() << "From localtime";
             Error() << "invalid timespec, assuming floating time. Type: " << dt.timeSpec() << "dt: " << dt.toString();
             return date;
         }
@@ -174,10 +164,8 @@
 
 QPair<std::string, std::string> fromMailto(const std::string &mailto)
 {
-    qWarning() << "fromMailto" << mailto;
     const std::string &decoded = toStdString(QUrl::fromPercentEncoding(QByteArray(mailto.c_str())));
 
-    qWarning() << "fromMailto decoded" << decoded;
     if (decoded.substr(0, 7).compare("mailto:")) {
         // WARNING("no mailto address");
         // std::cout << decoded << std::endl;

libkolab-3.0.1.tar.gz/conversion/kcalconversion.cpp -> libkolab-3.0.2.tar.gz/conversion/kcalconversion.cpp Changed

@@ -277,7 +277,6 @@
 
     if (e.start().isValid()) {
 
-        qWarning() << "Setting start" << toDate(e.start());
         i.setDtStart(toDate(e.start()));
         if (e.start().isDateOnly()) {
             i.setAllDay(true);
@@ -294,7 +293,6 @@
          * Since that means the semantics of the two are different, we have to store the kolab uid as a custom property.
          */
         // QUrl::fromPercentEncoding(
-        qWarning() << "Name " << fromStdString(a.contact().name()) << " EMail " << fromStdString(a.contact().email());
         KCalCore::Attendee attendee(fromStdString(a.contact().name()),
                                     fromStdString(a.contact().email()),
                                     a.rsvp(),
@@ -308,20 +306,17 @@
                 WARNING("multiple delegatees are not supported");
             }
 
-            qWarning() << "delegated from " << toMailto(a.delegatedTo().front().email(), a.delegatedTo().front().name()).toString();
             attendee.setDelegate(toMailto(a.delegatedTo().front().email(), a.delegatedTo().front().name()).toString());
         }
         if (!a.delegatedFrom().empty()) {
             if (a.delegatedFrom().size() > 1) {
                 WARNING("multiple delegators are not supported");
             }
-            qWarning() << "delegator from " << toMailto(a.delegatedFrom().front().email(), a.delegatedFrom().front().name()).toString();
             attendee.setDelegator(toMailto(a.delegatedFrom().front().email(), a.delegatedFrom().front().name()).toString());
         }
         if (a.cutype() != CutypeIndividual) {
             attendee.customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE, QString::number(a.cutype()));
         }
-        // qWarning() << attendee;
         i.addAttendee(attendee);
     }
     foreach (const Kolab::Attachment a, e.attachments()) {
@@ -374,13 +369,11 @@
         if (!attendee.delegate().isEmpty()) {
             std::string name;
             const std::string &email = fromMailto(QUrl(attendee.delegate()), name);
-            qWarning() << "delegate Email " << email << " EMail " << name << attendee.delegate();
             a.setDelegatedTo(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
         }
         if (!attendee.delegator().isEmpty()) {
             std::string name;
             const std::string &email = fromMailto(QUrl(attendee.delegator()), name);
-            qWarning() << "delegated from " << email << " EMail " << name << attendee.delegator();
             a.setDelegatedFrom(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
         }
         const QString &cutype = attendee.customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE);
@@ -544,7 +537,6 @@
         
         if (rrule.end().isValid()) {
             rec->setEndDateTime(toDate(rrule.end())); //TODO date/datetime setEndDate(). With date-only the start date has to be taken into account.
-            qWarning() << "Set end date time" << toDate(rrule.end());
         } else {
             rec->setDuration(rrule.count());
         }

libkolab-3.0.1.tar.gz/tests/calendaringtest.cpp -> libkolab-3.0.2.tar.gz/tests/calendaringtest.cpp Changed

libkolab-3.0.1.tar.gz/tests/calendaringtest.h -> libkolab-3.0.2.tar.gz/tests/calendaringtest.h Changed

libkolab.dsc Changed

@@ -2,7 +2,7 @@
 Source: libkolab
 Binary: libkolab3, php-kolab, python-kolab, libkolab-dev
 Architecture: any
-Version: 3.0.1-0~kolab1
+Version: 3.0.2-0~kolab1
 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Homepage: http://git.kolab.org/libkolab
@@ -10,6 +10,7 @@
 Build-Depends:
 	cmake,
 	debhelper,
+    dh-python,
 	libcurl4-gnutls-dev,
 	libboost-dev,
 	libboost-thread-dev,
@@ -20,6 +21,7 @@
     libkf5coreaddons-dev,
     libkf5calendarcore-dev,
     libkf5mime-dev,
+    libkf5codecs-dev,
 	libxerces-c-dev,
     php-cgi | php5-cli,
 	php-dev | php5-dev,
@@ -29,7 +31,9 @@
     plesk-php73-dev | bash,
     plesk-php74-dev | bash,
     psa | bash,
-	python-dev,
+    python2-dev | python-dev,
+    python-minimal | python2-minimal,
+    python3-all-dev,
 	swig (>= 2.0)
 Package-List:
  libkolab-dev deb libdevel optional
@@ -37,5 +41,5 @@
  php-kolab deb libs optional
  python-kolab deb python optional
 Files:
- 00000000000000000000000000000000 0 libkolab-3.0.1.tar.gz
+ 00000000000000000000000000000000 0 libkolab-3.0.2.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Overview

Request 3007 (accepted)

Request History