[SCM] okular packaging branch, master, updated. debian/4.7.4-2-8-gb1b7096

[Eshat Cakar]

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

The following commit has been merged in the master branch:
commit b1b7096bbd3fc2265106becb131b7435d5839257
Merge: 924ec1fdba9ce2a31bac28940d09ac50eb0df1a4 03e130578aff469da2ccaeff5e57df86a36430d1
Author: Eshat Cakar <info at eshat.de>
Date:   Wed Jun 13 16:21:47 2012 +0200

    Merge branch 'kde4.8'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/libokularcore1.symbols

 debian/changelog              |   14 ++++++++++++++
 debian/control                |    6 +++---
 debian/libokularcore1.install |    2 +-
 debian/libokularcore1.symbols |   28 +++++++++++++++++++++++-----
 debian/okular-dev.install     |    1 +
 debian/okular.install         |    1 +
 debian/watch                  |    2 ++
 7 files changed, 45 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index bb36d47,3d70795..4e20fe4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,17 +1,30 @@@
+ okular (4:4.8.4-0r0) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+   [ Eshat Cakar ]
+   * Bump kde-sc-dev-latest build dependency to 4.8.4.
+   * Bump kdelibs5-dev build dependency to 4.8.
+   * Bump Standards-Version to 3.9.3. No further changes.
+   * Add watch file.
+   * Update installed files.
+   * Update symbols for libokularcore1.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 13 Jan 2012 18:52:33 +0100
+ 
 +okular (4:4.7.4-2) unstable; urgency=low
 +
 +  * Team upload.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Confirm symbols files on all architectures.
 +
 +  [ Pino Toscano ]
 +  * Explicitly build depend on pkg-config, to not rely being implicitly
 +    installed by other packages.
 +
 + -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 06 Mar 2012 15:30:57 +0100
 +
  okular (4:4.7.4-1) experimental; urgency=low
  
    * New upstream release
diff --cc debian/control
index 58ebe40,7163eaf..37c2ac4
--- a/debian/control
+++ b/debian/control
@@@ -4,10 -4,9 +4,10 @@@ Priority: optiona
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Eshat Cakar <info at eshat.de>,
   José Manuel Santamaría Lema <panfaust at gmail.com>
- Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
+ Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
   cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
-  kdelibs5-dev (>= 4:4.7),
+  kdelibs5-dev (>= 4:4.8),
 + pkg-config,
   libdjvulibre-dev,
   libepub-dev,
   libpoppler-qt4-dev (>= 0.8.0),

-- 
okular packaging