Request 2015 (accepted)

libkolabxml.spec Changed

fix-qverify-argument.patch Added

@@ -0,0 +1,21 @@
+diff -ur libkolabxml-1.2.orig/tests/kolabconversationtest.cpp libkolabxml-1.2/tests/kolabconversationtest.cpp
+--- libkolabxml-1.2.orig/tests/kolabconversationtest.cpp	2016-09-09 12:42:25.000000000 +0200
++++ libkolabxml-1.2/tests/kolabconversationtest.cpp	2017-05-07 22:11:51.688771350 +0200
+@@ -27,7 +27,7 @@
+ void KolabConversationTest::configurationDeserialationTest()
+ {
+     boost::shared_ptr <Kolab::Configuration> ptr = Kolab::KolabObjects::deserializeObject<Kolab::Configuration>(TEST_DATA_PATH "/testfiles/testConfiguration.xml", true);
+-    QVERIFY(ptr);
++    QVERIFY(ptr != 0);
+     QVERIFY(ptr->isValid());
+     QCOMPARE(ptr->type(), Kolab::Configuration::TypeRelation);
+ 
+@@ -36,7 +36,7 @@
+ void KolabConversationTest::noteDeserialationTest()
+ {
+     boost::shared_ptr <Kolab::Note> ptr = Kolab::KolabObjects::deserializeObject<Kolab::Note>(TEST_DATA_PATH "/testfiles/testNote.xml", true);
+-    QVERIFY(ptr);
++    QVERIFY(ptr != 0);
+     QVERIFY(ptr->isValid());
+     QCOMPARE(ptr->summary(), std::string("summarytext"));
+ }

debian.changelog Changed

debian.control Changed

@@ -12,8 +12,8 @@
                libossp-uuid-dev,
                libqt4-dev,
                libxerces-c-dev,
-               php5-cli,
-               php5-dev,
+               php-cgi | php5-cli,
+               php-dev | php5-dev,
                python-dev,
                swig (>= 2.0),
                xsdcxx
@@ -21,7 +21,7 @@
 Standards-Version: 3.9.3
 Homepage: http://git.kolab.org/libkolabxml
 
-Package: libkolabxml1
+Package: libkolabxml1v5
 Architecture: any
 Depends: ${misc:Depends},
 	${shlibs:Depends}
@@ -34,7 +34,7 @@
 
 Package: php-kolabformat
 Architecture: any
-Depends: libkolabxml1 (= ${binary:Version}),
+Depends: libkolabxml1v5 (= ${binary:Version}),
 	${misc:Depends},
 	${shlibs:Depends},
 	${php:Depends},
@@ -48,7 +48,7 @@
 Package: python-kolabformat
 Architecture: any
 Section: python
-Depends: libkolabxml1 (= ${binary:Version}),
+Depends: libkolabxml1v5 (= ${binary:Version}),
 	python,
 	${misc:Depends},
 	${shlibs:Depends}
@@ -61,7 +61,7 @@
 Package: libkolabxml-dev
 Section: libdevel
 Architecture: any
-Depends: libkolabxml1 (= ${binary:Version}),
+Depends: libkolabxml1v5 (= ${binary:Version}),
          ${misc:Depends}
 Description: Development files for libkolabxml
  Libkolabxml is the reference implementation of the Kolab XML format.

debian.rules Changed

@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 PHPAPI := $(shell php-config --phpapi)
+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)')
 
 # Uncomment this to turn on verbose mode.
@@ -17,13 +19,23 @@
 	dh_gencontrol
 
 override_dh_auto_configure:
+	if [ $$(php-config --vernum) -gt 70000 ]; then \
+		sed -i -e 's/-c++ -php/-c++ -php7/g' src/php/CMakeLists.txt ; \
+	fi
+
 	dh_auto_configure -- \
-		-DSWIG=/usr/bin/swig2.0 \
+		-DSWIG=/usr/bin/swig \
 		-DPHP_BINDINGS=ON \
+		-DPHP_INCLUDE_DIR=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
 		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
 
 override_dh_install:
 	mkdir -p debian/tmp/usr/share/php
-	mv debian/tmp/usr/lib/php5/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
+	if [ -d "/etc/php/mods-available" ]; then \
+		echo "debian/kolabformat.ini etc/php/mods-available" >> debian/php-kolabformat.install ; \
+	else \
+		echo "debian/kolabformat.ini etc/php5/mods-available" >> debian/php-kolabformat.install ; \
+	fi
+	mv debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
 	dh_install --list-missing

debian.series Changed

debian.tar.gz/kolabformat.ini Changed

debian.tar.gz/libkolabxml1.lintian-overrides Deleted

debian.tar.gz/libkolabxml1v5.install Changed

debian.tar.gz/libkolabxml1v5.lintian-overrides Added

debian.tar.gz/php-kolabformat.install Changed

debian.tar.gz/php-kolabformat.postinst Changed

debian.tar.gz/shlibs Changed

debian.tar.gz/usr Deleted

debian.tar.gz/usr/share Deleted

debian.tar.gz/usr/share/php5 Deleted

debian.tar.gz/usr/share/php5/kolab Deleted

libkolabxml-1.2.tar.gz/src/containers/kolabcontainers.cpp Changed

libkolabxml-1.2.tar.gz/src/containers/kolabcontainers.h Changed

libkolabxml-1.2.tar.gz/src/objectvalidation.cpp Changed

libkolabxml-1.2.tar.gz/src/xcalconversions.h Changed

@@ -1351,7 +1351,9 @@
             case Kolab::Alarm::AudioAlarm:
                 p = std::auto_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
                 p->description(PropType::description_type(alarm.description()));
-                p->attach(fromAttachment(alarm.audioFile()));
+                if (alarm.audioFile().isValid()) {
+                    p->attach(fromAttachment(alarm.audioFile()));
+                }
                 break;
             case Kolab::Alarm::InvalidAlarm:
                 break;
@@ -1398,16 +1400,17 @@
             }
             alarm = Kolab::Alarm((*prop.summary()).text(), (*prop.description()).text(), attendees);
         } else if (prop.action().text() == AUDIOALARM) {
-            if (!prop.attach()) {
-                ERROR("audio file is missing");
-                continue;
-            }
-            const Kolab::Attachment &attach = toAttachment<icalendar_2_0::properties::attach_type>(*prop.attach());
-            if (!attach.isValid()) {
-                ERROR("audio file is invalid");
-                continue;
+            if (prop.attach()) {
+                const Kolab::Attachment &attach = toAttachment<icalendar_2_0::properties::attach_type>(*prop.attach());
+                if (!attach.isValid()) {
+                    ERROR("audio file is invalid");
+                    continue;
+                }
+                alarm = Kolab::Alarm(attach);
+            } else {
+                //An audio alarm without an audio file is valid according to spec
+                alarm = Kolab::Alarm(Kolab::Alarm::AudioAlarm);
             }
-            alarm = Kolab::Alarm(attach);
         } else {
             ERROR("unknown alarm type " + prop.action().text());
             continue;
@@ -1873,7 +1876,7 @@
         }
 
         typename KolabType::properties_type::created_type created;
-        if (incidence.created().isValid()) {
+        if (incidence.created().isValid() && !incidence.created().isDateOnly()) {
             created.date_time(fromDateTime(incidence.created()));
         } else {
             created.date_time(fromDateTime(timestamp()));

libkolabxml-1.2.tar.gz/tests/bindingstest.cpp Changed

@@ -334,11 +334,9 @@
     Kolab::Alarm emailAlarm("ident", "value", att);
     emailAlarm.setStart(Kolab::cDateTime(2003,2,3,2,3,4, true));
     alarms.push_back(emailAlarm);
-//     Kolab::Attachment audiofile;
-//     audiofile.setUri("ksdjlksdflj", "sdkljdfl");
-//     Kolab::Alarm audio(audiofile);
-//     audio.setStart(Kolab::cDateTime(2003,2,3,2,3,4, true));
-//     alarms.push_back(audio);
+    Kolab::Alarm audio(Kolab::Alarm::AudioAlarm);
+    audio.setStart(Kolab::cDateTime(2003,2,3,2,3,4, true));
+    alarms.push_back(audio);
     ev.setAlarms(alarms);
 }
 
@@ -415,6 +413,7 @@
 void BindingsTest::eventDuration()
 {
     Kolab::Event ev;
+    ev.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     ev.setStart(Kolab::cDateTime("Europe/Zurich", 2006,1,8,12,0,0));
     ev.setDuration(Kolab::Duration(11,22,33,44, true));
 
@@ -431,6 +430,7 @@
 {
     Kolab::Event ev;
     ev.setUid("uid1");
+    ev.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     ev.setStart(Kolab::cDateTime("Europe/Zurich", 2006,1,8,12,0,0));
     std::vector<Kolab::Event> exceptions;
     Kolab::Event ex1;
@@ -481,6 +481,7 @@
 void BindingsTest::dueDateDateOnly()
 {
     Kolab::Todo ev;
+    ev.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     ev.setDue(Kolab::cDateTime(2006,1,8));
     std::string result = Kolab::writeTodo(ev);
     QVERIFY(Kolab::error() == Kolab::NoError);

libkolabxml-1.2.tar.gz/tests/validationtest.cpp Changed

@@ -34,6 +34,7 @@
 void ValidationTest::testNoErrorOnValidEvent()
 {
     Event event;
+    event.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     event.setStart(cDateTime(2013,1,1,1,1,1));
     writeEvent(event);
     QCOMPARE(Kolab::error(), Kolab::NoError);
@@ -43,18 +44,21 @@
 {
     {
         Todo todo;
+        todo.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
         todo.setStart(cDateTime("Europe/Zurich", 2013,1,1,1,1,1));
         writeTodo(todo);
         QCOMPARE(Kolab::error(), Kolab::NoError);
     }
     {
         Todo todo;
+        todo.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
         todo.setDue(cDateTime("Europe/Zurich", 2013,1,1,1,1,1));
         writeTodo(todo);
         QCOMPARE(Kolab::error(), Kolab::NoError);
     }
     {
         Todo todo;
+        todo.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
         todo.setStart(cDateTime("Europe/Zurich", 2013,1,1,1,1,1));
         todo.setDue(cDateTime("Europe/Zurich", 2013,1,1,1,1,1));
         writeTodo(todo);
@@ -65,6 +69,7 @@
 void ValidationTest::testOlsonTimezone()
 {
     Event event;
+    event.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     event.setStart(cDateTime("Europe/Zurich",2013,1,1,1,1,1));
     writeEvent(event);
     QCOMPARE(Kolab::error(), Kolab::NoError);
@@ -73,12 +78,14 @@
 void ValidationTest::testDifferentTimezones()
 {
     Event event;
+    event.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     event.setStart(cDateTime("Europe/Zurich",2013,1,1,1,1,1));
     event.setEnd(cDateTime("Europe/London",2013,1,1,1,1,1));
     writeEvent(event);
     QCOMPARE(Kolab::error(), Kolab::NoError);
 
     Todo todo;
+    todo.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     todo.setStart(cDateTime("Europe/Zurich",2013,1,1,1,1,1));
     todo.setDue(cDateTime("Europe/London",2013,1,1,1,1,1));
     writeTodo(todo);
@@ -88,6 +95,7 @@
 void ValidationTest::testUTCwithTimezone()
 {
     Event event;
+    event.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     cDateTime dt("Europe/Zurich",2013,1,1,1,1,1);
     dt.setUTC(true);
     event.setStart(dt);
@@ -98,6 +106,7 @@
 void ValidationTest::testTimezoneZ()
 {
     Event event;
+    event.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     event.setStart(cDateTime("Z",2013,1,1,1,1,1));
     writeEvent(event);
     QCOMPARE(Kolab::error(), Kolab::Error);
@@ -106,6 +115,7 @@
 void ValidationTest::testWindowsTimezone()
 {
     Event event;
+    event.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     event.setStart(cDateTime("Central European Standard Time",2013,1,1,1,1,1));
     writeEvent(event);
     QCOMPARE(Kolab::error(), Kolab::Error);

libkolabxml.dsc Changed

@@ -1,8 +1,8 @@
 Format: 1.0
 Source: libkolabxml
-Binary: libkolabxml1, php-kolabformat, python-kolabformat, libkolabxml-dev
+Binary: libkolabxml1v5, php-kolabformat, python-kolabformat, libkolabxml-dev
 Architecture: any
-Version: 1.2~dev20150904-0~kolab31.2~dev20151230-0~kolab1
+Version: 1.2~dev20160909-0~kolab1
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org>
 Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
 Homepage: http://git.kolab.org/libkolabxml
@@ -16,14 +16,14 @@
                libossp-uuid-dev,
                libqt4-dev,
                libxerces-c-dev,
-               php5-cli,
-               php5-dev,
+               php-cgi | php5-cli,
+               php-dev | php5-dev,
                python-dev,
                swig (>= 2.0),
                xsdcxx
 Package-List: 
  libkolabxml-dev deb libdevel optional
- libkolabxml1 deb libs optional
+ libkolabxml1v5 deb libs optional
  php-kolabformat deb libs optional
  python-kolabformat deb python optional
 Files:

Overview

Request 2015 (accepted)

Request History