[SCM] okular packaging branch, master, updated. debian/4%17.08.3-3-7-gbf58bd6

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/okular.git;a=commitdiff;h=7676210

The following commit has been merged in the master branch:
commit 7676210150e0443a09bd6bcb682cf6fd8e492bb4
Author: Pino Toscano <pino at debian.org>
Date:   Tue Feb 20 17:03:30 2018 +0100

    split QML off okular
---
 debian/changelog                         |  5 +++++
 debian/control                           | 20 +++++++++++++++-----
 debian/okular.install                    |  1 -
 debian/qml-module-org-kde-okular.install |  1 +
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 896d2c8..3bc0745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ okular (4:17.12.2-0r1) UNRELEASED; urgency=medium
   * Add the libmarkdown2-dev, and libzip-dev build dependencies, optionally
     needed by the new version (for CHM and Mardown backends).
   * Update install files.
+  * Split the QML module from okular to a separate qml-module-org-kde-okular:
+    this way the main application does not contain QML-related files, and
+    dependencies anymore
+    - make okular-mobile depend on this new module
+    - remove all the QML dependencies from okular
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 20 Feb 2018 16:07:08 +0100
 
diff --git a/debian/control b/debian/control
index 3f16534..b76c7c5 100644
--- a/debian/control
+++ b/debian/control
@@ -63,11 +63,6 @@ Package: okular
 Section: graphics
 Architecture: any
 Depends: libokular5core8 (= ${binary:Version}),
-         qml-module-org-kde-kirigami,
-         qml-module-org-kde-kquickcontrolsaddons,
-         qml-module-qt-labs-folderlistmodel,
-         qml-module-qtgraphicaleffects,
-         qml-module-qtquick-controls,
          kinit,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -141,10 +136,25 @@ Description: additional document format support for Okular
  .
  This package is part of the KDE graphics module.
 
+Package: qml-module-org-kde-okular
+Architecture: any
+Depends: qml-module-qtgraphicaleffects,
+         qml-module-qtquick-controls2,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: okular (<< 4:17.12.2~),
+Replaces: okular (<< 4:17.12.2~),
+Description: mobile support for Okular - QML modules
+ This package contains the QML module for interfacing with the Okular core
+ library.
+ .
+ This package is part of the KDE graphics module.
+
 Package: okular-mobile
 Architecture: any
 Depends: qml-module-org-kde-kirigami,
          qml-module-org-kde-kquickcontrolsaddons,
+         qml-module-org-kde-okular (= ${binary:Version}),
          qml-module-qtgraphicaleffects,
          qml-module-qtquick-controls2,
          ${misc:Depends},
diff --git a/debian/okular.install b/debian/okular.install
index e8265ba..0977a37 100644
--- a/debian/okular.install
+++ b/debian/okular.install
@@ -13,7 +13,6 @@ usr/lib/*/qt5/plugins/okular/generators/okularGenerator_poppler.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_txt.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_xps.so
 usr/lib/*/qt5/plugins/okularpart.so
-usr/lib/*/qt5/qml/org/kde/okular/
 usr/share/applications/okularApplication_comicbook.desktop
 usr/share/applications/okularApplication_dvi.desktop
 usr/share/applications/okularApplication_fax.desktop
diff --git a/debian/qml-module-org-kde-okular.install b/debian/qml-module-org-kde-okular.install
new file mode 100644
index 0000000..5639d65
--- /dev/null
+++ b/debian/qml-module-org-kde-okular.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/qml/org/kde/okular/

-- 
okular packaging