[SCM] kactivities packaging branch, master, updated. debian/5.12.0-1-238-g47d060f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5dbd8570050bfe94a381f2c3c8c318062b44c15d
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Nov 18 20:16:55 2012 +0100

    Avoid a circular dependency between libkactivities-bin and libkactivities6.
---
 debian/changelog               | 7 +++++++
 debian/control                 | 3 ++-
 debian/libkactivities6.symbols | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f1a4a2d..a1760d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ kactivities (4:4.9.3-0r0) UNRELEASED; urgency=low
   * Update installed files.
   * Update symbols.
 
+  [ José Manuel Santamaría Lema ]
+  * In order to avoid a circular dependency between libkactivities-bin and
+    libkactivities6 (this didn't happen in 4.8.x):
+    + libkactivities6.symbols adds a dependency on libkactivities-bin
+    + libkactivities6 recommends libkactivities-bin to avoid possible partial
+      upgrades problems.
+
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sun, 18 Nov 2012 17:55:37 +0100
 
 kactivities (4:4.8.5-0r0) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 8f87478..d432e7c 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,8 @@ Description: executables for the KDE Activities
 Package: libkactivities6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkactivities-bin (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libkactivities-bin (= ${binary:Version})
 Description: Activities library
  This library provides functionality for managing activities.
  .
diff --git a/debian/libkactivities6.symbols b/debian/libkactivities6.symbols
index a12e33b..9b16ba5 100644
--- a/debian/libkactivities6.symbols
+++ b/debian/libkactivities6.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.8.1 amd64
 libkactivities.so.6 libkactivities6 #MINVER#
+| libkactivities6 #MINVER#, libkactivities-bin
 * Build-Depends-Package: libkactivities-dev
  _ZN11KActivities10Controller11addActivityERK7QString at Base 4:4.8.1
  _ZN11KActivities10Controller11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.8.1

-- 
kactivities packaging