[SCM] okular packaging branch, master, updated. debian/4.14.2-2-2-gdc1840f

[Scott Kitterman]

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

The following commit has been merged in the master branch:
commit dc1840f3fc8bbaafa85d37c60ef0222f664c4239
Author: Scott Kitterman <scott at kitterman.com>
Date:   Mon Sep 7 15:20:17 2015 -0400

    Remove libkscreen build dep to allow the transition to happen.
---
 debian/changelog     |  7 +++----
 debian/control       |  2 --
 debian/not-installed | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6792e82..ac72946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
-okular (4:4.14.2-2.1) UNRELEASED; urgency=medium
+okular (4:4.14.2-3) unstable; urgency=medium
 
-  * Non-maintainer upload.
-  * recommends cups-bsd (Closes: #499514) 
+  * Remove libkscreen build dep to allow the transition to happen.
 
- -- Adrien Grellier <perso at adrieng.fr>  Wed, 26 Nov 2014 21:30:25 +0100
+ -- Maximiliano Curia <maxy at debian.org>  Sat, 11 Jul 2015 17:36:48 +0200
 
 okular (4:4.14.2-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 30186b1..96af9ce 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: cmake,
                libjpeg-dev,
                libkactivities-dev (>= 4:4.11),
                libkexiv2-dev,
-               libkscreen-dev,
                libpoppler-qt4-dev (>= 0.8.0),
                libqca2-dev,
                libqimageblitz-dev,
@@ -47,7 +46,6 @@ Architecture: any
 Depends: libokularcore5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: cups-bsd
 Suggests: ghostscript,
           jovie,
           okular-extra-backends (= ${binary:Version}),
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..07f01a8
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,15 @@
+usr/share/applications/kde4/active-documentviewer_chm.desktop
+usr/share/applications/kde4/active-documentviewer_comicbook.desktop
+usr/share/applications/kde4/active-documentviewer_djvu.desktop
+usr/share/applications/kde4/active-documentviewer_dvi.desktop
+usr/share/applications/kde4/active-documentviewer_epub.desktop
+usr/share/applications/kde4/active-documentviewer_fax.desktop
+usr/share/applications/kde4/active-documentviewer_fb.desktop
+usr/share/applications/kde4/active-documentviewer_ghostview.desktop
+usr/share/applications/kde4/active-documentviewer_kimgio.desktop
+usr/share/applications/kde4/active-documentviewer_ooo.desktop
+usr/share/applications/kde4/active-documentviewer_pdf.desktop
+usr/share/applications/kde4/active-documentviewer_plucker.desktop
+usr/share/applications/kde4/active-documentviewer_tiff.desktop
+usr/share/applications/kde4/active-documentviewer_txt.desktop
+usr/share/applications/kde4/active-documentviewer_xps.desktop

-- 
okular packaging