[SCM] Calligra suite packaging branch, master, updated. debian/2.6.4-1-13-g63d7193

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=aa6704c

The following commit has been merged in the master branch:
commit aa6704ce9a9941a29fbb363d8f15eb4d0365eab0
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Fri Jul 19 13:05:19 2013 +0200

    build with libkactivites, as the version 6.1 is now in sid
---
 debian/changelog |   10 ++++++++++
 debian/control   |    2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0851703..340a809 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+calligra (1:2.7.0-0r1.1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  [ Adrien Grellier ]
+
+  * build with libkactivites, as the version 6.1 is now in sid 
+
+
+ -- Adrien Grellier <perso at adrieng.fr>  Sat, 27 Jul 2013 17:54:00 +0200
+
 calligra (1:2.6.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 2609ac0..68d14cf 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
  libgsl0-dev,
  libicu-dev,
  libjpeg-dev,
-# libkactivities-dev, #required version 6.1.0
+ libkactivities-dev,
  libkdcraw-dev (>= 4:4.4.3),
  liblcms2-dev,
  libmarble-dev (>> 4:4.8),

-- 
Calligra suite packaging