[SCM] okular packaging branch, master, updated. debian/4.7.4-2-9-g6baef7d

[Sune Vuorela]

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

The following commit has been merged in the master branch:
commit 6baef7d6c5f454462d96c5eddff15a2deffa6c74
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sun Jun 17 01:15:17 2012 +0200

    update for 4.8
---
 debian/changelog              |    7 ++++---
 debian/libokularcore1.symbols |    9 ++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e20fe4..5c2e312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-okular (4:4.8.4-0r0) UNRELEASED; urgency=low
+okular (4:4.8.4-1) unstable; urgency=low
 
+  * Team upload
   * New upstream release.
+  * Update symbols for libokularcore1.
 
   [ Eshat Cakar ]
   * Bump kde-sc-dev-latest build dependency to 4.8.4.
@@ -8,9 +10,8 @@ okular (4:4.8.4-0r0) UNRELEASED; urgency=low
   * 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
+ -- Sune Vuorela <sune at debian.org>  Sun, 17 Jun 2012 01:10:33 +0200
 
 okular (4:4.7.4-2) unstable; urgency=low
 
diff --git a/debian/libokularcore1.symbols b/debian/libokularcore1.symbols
index e60020a..ceec76d 100644
--- a/debian/libokularcore1.symbols
+++ b/debian/libokularcore1.symbols
@@ -1,7 +1,7 @@
-# SymbolsHelper-Confirmed: 4:4.8.4 amd64
+# SymbolsHelper-Confirmed: 4:4.8.4 amd64 i386
 libokularcore.so.1 libokularcore1 #MINVER#
- (optional=external|arch=amd64 kfreebsd-amd64 kfreebsd-i386)_ZN19KCoreConfigSkeleton8ItemEnum7Choice2D1Ev at Base 4:4.6.5
- (optional=external|arch=amd64 kfreebsd-amd64 kfreebsd-i386)_ZN19KCoreConfigSkeleton8ItemEnum7Choice2D2Ev at Base 4:4.6.5
+ (optional=external)_ZN19KCoreConfigSkeleton8ItemEnum7Choice2D1Ev at Base 4:4.6.5
+ (optional=external)_ZN19KCoreConfigSkeleton8ItemEnum7Choice2D2Ev at Base 4:4.6.5
  (optional=external|arch=kfreebsd-amd64 kfreebsd-i386)_ZN4KUrl4ListD1Ev at Base 4:4.6.5
  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN4KUrl4ListD2Ev at Base 4:4.6.5
  _ZN6Okular10Annotation11setContentsERK7QString at Base 4:4.4.5
@@ -31,6 +31,8 @@ libokularcore.so.1 libokularcore1 #MINVER#
  _ZN6Okular10Annotation5styleEv at Base 4:4.4.5
  _ZN6Okular10Annotation6Window10setSummaryERK7QString at Base 4:4.4.5
  _ZN6Okular10Annotation6Window10setTopLeftERKNS_15NormalizedPointE at Base 4:4.4.5
+ (arch=i386)_ZN6Okular10Annotation6Window7PrivateD1Ev at Base 4:4.8.4
+ (arch=i386)_ZN6Okular10Annotation6Window7PrivateD2Ev at Base 4:4.8.4
  _ZN6Okular10Annotation6Window7setTextERK7QString at Base 4:4.4.5
  _ZN6Okular10Annotation6Window8setFlagsEi at Base 4:4.4.5
  _ZN6Okular10Annotation6Window8setTitleERK7QString at Base 4:4.4.5
@@ -387,6 +389,7 @@ libokularcore.so.1 libokularcore1 #MINVER#
  _ZN6Okular19HighlightAnnotation16setHighlightTypeENS0_13HighlightTypeE at Base 4:4.4.5
  _ZN6Okular19HighlightAnnotation4Quad10setFeatherEd at Base 4:4.4.5
  _ZN6Okular19HighlightAnnotation4Quad11setCapStartEb at Base 4:4.4.5
+ (arch=i386)_ZN6Okular19HighlightAnnotation4Quad7PrivateaSERKS2_ at Base 4:4.8.4
  _ZN6Okular19HighlightAnnotation4Quad8setPointERKNS_15NormalizedPointEi at Base 4:4.4.5
  _ZN6Okular19HighlightAnnotation4Quad9setCapEndEb at Base 4:4.4.5
  _ZN6Okular19HighlightAnnotation4Quad9transformERK7QMatrix at Base 4:4.4.5

-- 
okular packaging