[SCM] okular packaging branch, kubuntu_vivid_backports, updated. debian/4.14.2-2-12-g7b678ad

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 7b678ad26e87135601ea432ef23eae1690c60fb6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Mon Apr 20 10:54:17 2015 -0700

    Fix kdelibs version
---
 debian/changelog      | 1 +
 debian/control        | 2 +-
 debian/okular.install | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2fa47b..a7bc231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 okular (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Fix kdelibs version 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 15 Apr 2015 15:02:47 -0700
 
diff --git a/debian/control b/debian/control
index fbe80c8..b3e1ce5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
                kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev (>= 4:15.04.0),
+               kdelibs5-dev (>= 4:4.14),
                libchm-dev,
                libdjvulibre-dev,
                libepub-dev,
diff --git a/debian/okular.install b/debian/okular.install
index 3d699b9..6904d16 100644
--- a/debian/okular.install
+++ b/debian/okular.install
@@ -30,8 +30,8 @@ usr/share/doc/kde/HTML/*/okular
 usr/share/icons/hicolor/*/apps/okular.png
 usr/share/icons/hicolor/scalable/apps/okular.svgz
 usr/share/kde4/apps/kconf_update/okular.upd
-usr/share/kde4/apps/okular/icons/hicolor/*/apps/okular-gv.png
 usr/share/kde4/apps/okular/icons/hicolor/*/apps/okular-fb2.png
+usr/share/kde4/apps/okular/icons/hicolor/*/apps/okular-gv.png
 usr/share/kde4/apps/okular/part-viewermode.rc
 usr/share/kde4/apps/okular/part.rc
 usr/share/kde4/apps/okular/pics

-- 
okular packaging