[SCM] kactivities packaging branch, master, updated. debian/4.13.1-1-128-gfafc380

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e16df808875a76b0c7028f4a22db52bdc91d946d
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Jun 2 16:10:42 2012 +0200

    Update symbol file.
---
 debian/changelog               | 5 ++++-
 debian/libkactivities6.symbols | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aab9471..ef9f755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,12 @@ kactivities (4:4.8.80a-0ubuntu1) UNRELEASED; urgency=low
     - Update libkactivities-bin.install for changed files.
 
   [ Philip Muškovac ]
-  * Merge with debian git, remaining changes: 
+  * Merge with debian git, remaining changes:
     - keep symbol file
 
+  [ Felix Geyer ]
+  * Update symbol file.
+
  -- Jonathan Thomas <echidnaman at kubuntu.org>  Thu, 24 May 2012 23:34:02 -0400
 
 kactivities (4:4.8.3-0ubuntu1) quantal; urgency=low
diff --git a/debian/libkactivities6.symbols b/debian/libkactivities6.symbols
index 34dea5c..5620021 100644
--- a/debian/libkactivities6.symbols
+++ b/debian/libkactivities6.symbols
@@ -77,7 +77,7 @@ libkactivities.so.6 libkactivities6 #MINVER#
  _ZNK11KActivities4Info11isEncryptedEv at Base 4:4.8.80
  _ZNK11KActivities4Info11resourceUriEv at Base 4.7.90
  _ZNK11KActivities4Info12availabilityEv at Base 4.7.90
- _ZNK11KActivities8Consumer26isResourceLinkedToActivityERK4QUrlRK7QString at Base 4:4.8.80
+ _ZNK11KActivities4Info15linkedResourcesEv at Base 4:4.8.80a
  _ZNK11KActivities4Info2idEv at Base 4.7.90
  _ZNK11KActivities4Info3uriEv at Base 4.7.90
  _ZNK11KActivities4Info4iconEv at Base 4.7.90
@@ -88,6 +88,7 @@ libkactivities.so.6 libkactivities6 #MINVER#
  _ZNK11KActivities8Consumer14listActivitiesENS_4Info5StateE at Base 4.7.90
  _ZNK11KActivities8Consumer14listActivitiesEv at Base 4.7.90
  _ZNK11KActivities8Consumer15currentActivityEv at Base 4.7.90
+ _ZNK11KActivities8Consumer26isResourceLinkedToActivityERK4QUrlRK7QString at Base 4:4.8.80
  _ZTIN11KActivities10ControllerE at Base 4.7.90
  _ZTIN11KActivities16ResourceInstanceE at Base 4.7.90
  _ZTIN11KActivities4InfoE at Base 4.7.90

-- 
kactivities packaging