[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.2-3-6-g4bcced3

[Adrien Grellier]

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

The following commit has been merged in the tip branch:
commit 853a750544105d83034117846b5d6cfb22c51639
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Fri Jun 22 08:57:46 2012 +0200

    bump marble build-dep and release to unstable
---
 debian/changelog |   10 ++++++++--
 debian/control   |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fbb769d..b165758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-calligra (1:2.4.2-3) UNRELEASED; urgency=low
+calligra (1:2.4.2-3) unstable; urgency=low
+
+  * Team upload
 
   [ Pino Toscano ]
   * Fix conflict/replaces with old koffice names. (Closes: #677085)
   * Make okular-backend-odp enhance okular.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 13 Jun 2012 10:58:57 +0200
+  [ Sune Vuorela ]
+  * Ensure we are using the new libmarble-dev (this can be relaxed later if
+    needed)
+
+ -- Sune Vuorela <sune at debian.org>  Fri, 22 Jun 2012 08:56:20 +0200
 
 calligra (1:2.4.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 15d0c37..be4e651 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
  libjpeg-dev,
  libkdcraw-dev (>= 4:4.4.3),
  liblcms2-dev,
- libmarble-dev,
+ libmarble-dev (>> 4:4.8),
  libmysqlclient-dev,
  libopenexr-dev,
  libopenjpeg-dev,

-- 
Calligra suite packaging