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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit af79fd1b8aee140fbd44d69d57da090dd885717d
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 20 13:01:15 2017 +0200

    disable okular generators for now
    
    no kf5 okular in debian yet
---
 debian/changelog |  3 +++
 debian/control   | 54 +++++++++++++++++++++++++++---------------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da4b3ad..050a640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,9 @@ calligra (1:3.0.1+dfsg-0r1) UNRELEASED; urgency=medium
     - remove symlinking done in calligra-gemini
   * Turn the calligra-reports-web-element package into a transitional package
     for libkreport3-plugin-web, which provides the equivalent component.
+  * Disable the okular-backend-odp, and okular-backend-odt binaries, since
+    there is no KF5 version of Okular in Debian currently
+    - comment out the okular-dev build dependency
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Aug 2017 15:51:55 +0200
 
diff --git a/debian/control b/debian/control
index 5eb2c2a..39beb7b 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Build-Depends: cmake,
                libwpg-dev (>= 0.3),
                libwps-dev (>= 0.4),
                libxml2-dev,
-               okular-dev,
+#               okular-dev,
                pkg-config,
                pkg-kde-tools,
                pstoedit,
@@ -289,30 +289,30 @@ 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-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-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.

-- 
Calligra suite packaging