[pkg-kolab] Bug#747808: NMU uploaded to DELAYED/2 (to unblock php5.6 transition)

[Ondřej Surý]

And here's the very simple patch...

Ondrej

$ git diff debian/0.4.2-7.1..debian/0.4.2-7.2 
diff --git a/debian/changelog b/debian/changelog
index 7a9108a..7e9e596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libkolab (0.4.2-7.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix double definition of struct QMetaTypeId<KCalCore::Duration>
+    (Closes: #747808)
+
+ -- Ondřej Surý <ondrej at debian.org>  Sun, 01 Jun 2014 23:17:12 +0200
+
 libkolab (0.4.2-7.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/dont-redefine-KCalCore-Duration.patch
b/debian/patches/dont-redefine-KCalCore-Duration.patch
new file mode 100644
index 0000000..ebc65e6
--- /dev/null
+++ b/debian/patches/dont-redefine-KCalCore-Duration.patch
@@ -0,0 +1,10 @@
+--- libkolab.orig/tests/testhelpers.h
++++ libkolab/tests/testhelpers.h
+@@ -44,7 +44,6 @@ Q_DECLARE_METATYPE(std::vector<Kolab::Fr
+ Q_DECLARE_METATYPE(KCalCore::Event);
+ Q_DECLARE_METATYPE(KCalCore::Todo);
+ Q_DECLARE_METATYPE(KCalCore::Journal);
+-Q_DECLARE_METATYPE(KCalCore::Duration);
+ 
+ namespace QTest {
+     
diff --git a/debian/patches/series b/debian/patches/series
index 8afd1a4..7657686 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ simpler_cmake_test.patch
 libkolab-0.3.1-php-paths.patch
 add-linker-flags.patch
 use-python2-only.patch
+dont-redefine-KCalCore-Duration.patch


-- 
Ondřej Surý <ondrej at sury.org>
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server