[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=c356a35

The following commit has been merged in the tip branch:
commit c356a35974799b4e69715157b8137d909d5dceb9
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 17 17:08:35 2012 +0200

    make okular-backend-odp enhance okular
---
 debian/changelog |    1 +
 debian/control   |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bb2cbb..fbb769d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ calligra (1:2.4.2-3) UNRELEASED; urgency=low
 
   [ 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
 
diff --git a/debian/control b/debian/control
index 00def65..15d0c37 100644
--- a/debian/control
+++ b/debian/control
@@ -504,6 +504,7 @@ Architecture: any
 Section: graphics
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Recommends: okular
+Enhances: okular
 Description: Okular backend for ODP documents
  This package provides a backend for Okular to view OpenDocument Presentation
  (ODP) documents.

-- 
Calligra suite packaging