[SCM] Calligra suite packaging branch, master, updated. debian/3.0.1+dfsg-2-16-g48fa6c8

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 48fa6c8cff24d12ac6e4c5eeb5724b3c0291470c
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jan 31 08:59:05 2018 +0100

    readd okular backends
---
 debian/changelog |  3 +++
 debian/control   | 56 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 699932c..6a2080e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ calligra (1:3.1.0+dfsg-0r1) UNRELEASED; urgency=medium
   * Minor updates to the watch file.
   * Update install files.
   * Bring back the calligra-gemini, and calligra-gemini-data packages.
+  * Bring back the okular-backend-odp, and okular-backend-odt packages, as
+    a KF5 version of Okular is available
+    - uncomment the okular-dev build dependency, with the right version
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Sep 2017 07:52:25 +0200
 
diff --git a/debian/control b/debian/control
index 01c41d5..fb20327 100644
--- a/debian/control
+++ b/debian/control
@@ -73,7 +73,7 @@ Build-Depends: cmake,
                libwps-dev (>= 0.4),
                libx11-dev,
                libxml2-dev,
-#               okular-dev,
+               okular-dev (>= 4:17.08),
                pkg-config,
                pkg-kde-tools (>= 0.15.16),
                pstoedit,
@@ -258,33 +258,33 @@ Description: common shared data for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
-#Package: okular-backend-odp
-#Architecture: any
-#Section: graphics
-#Depends: calligra-libs (= ${binary:Version}),
-#         ${misc:Depends},
-#         ${shlibs:Depends}
-#Recommends: okular
-#Enhances: okular
-#Description: Okular backend for ODP documents
-# This package provides a backend for Okular to view OpenDocument Presentation
-# (ODP) documents.
-# .
-# This package is part of the Calligra Suite.
-
-#Package: okular-backend-odt
-#Architecture: any
-#Section: graphics
-#Depends: calligra-libs (= ${binary:Version}),
-#         ${misc:Depends},
-#         ${shlibs:Depends}
-#Recommends: okular
-#Enhances: okular
-#Description: Okular backend for ODT documents
-# This package provides a backend for Okular to view OpenDocument Text
-# (ODT) documents, but also DOC, DOCX and WPD documents.
-# .
-# This package is part of the Calligra Suite.
+Package: okular-backend-odp
+Architecture: any
+Section: graphics
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: okular
+Enhances: okular
+Description: Okular backend for ODP documents
+ This package provides a backend for Okular to view OpenDocument Presentation
+ (ODP) documents, but also PowerPoint and PPTX documents.
+ .
+ This package is part of the Calligra Suite.
+
+Package: okular-backend-odt
+Architecture: any
+Section: graphics
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: okular
+Enhances: okular
+Description: Okular backend for ODT documents
+ This package provides a backend for Okular to view OpenDocument Text
+ (ODT) documents, but also DOC, DOCX, RTF and WPD documents.
+ .
+ This package is part of the Calligra Suite.
 
 Package: calligra-gemini
 Architecture: any

-- 
Calligra suite packaging