[SCM] kwallet packaging branch, master, updated. debian/5.13.0-2-4-g88217bf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwallet.git;a=commitdiff;h=88217bf

The following commit has been merged in the master branch:
commit 88217bff9ab8587294ee9f0fb41bb50d3c81820d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 14 12:13:20 2015 +0200

    Adapt Scotts changes to symbols fiddling as discussed via irc.
---
 debian/changelog             | 5 +++--
 debian/control               | 5 +----
 debian/libkf5wallet5.symbols | 1 +
 debian/rules                 | 4 ----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8b7c55..1dc3b92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ kwallet-kf5 (5.14.0-1~) UNRELEASED; urgency=medium
 
   [ Scott Kitterman ]
   * Team upload.
-  * Reorder Depends/Recommends in the package so that users with recommends
-    disabled still get a functioning kwallet (Closes: #798724)
+  * Add the libkf5wallet-bin dependency in the symbols files, to have a
+    working kwallet on programs that link against libkf5wallet5.
+    (Closes: #798724)
 
   [ Maximiliano Curia ]
   * New upstream release (5.14.0).
diff --git a/debian/control b/debian/control
index a3e7a66..9d4ab89 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,6 @@ Description: development files for kwallet-framework
 Package: libkf5wallet-bin
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libkf5wallet5 (= ${binary:Version})
 Breaks: libkf5wallet5 (<< 4.100.0)
 Replaces: libkf5wallet5 (<< 4.100.0)
 Description: Secure and unified container for user passwords.
@@ -55,8 +54,7 @@ Description: Secure and unified container for user passwords.
 
 Package: libkf5wallet5
 Architecture: any
-Depends: libkf5wallet-bin (= ${binary:Version}),
-         libkf5wallet-data (= ${source:Version}),
+Depends: libkf5wallet-data (= ${source:Version}),
          libkwalletbackend5-5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -80,7 +78,6 @@ Description: Secure and unified container for user passwords.
 Package: libkwalletbackend5-5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libkf5wallet (= ${binary:Version})
 Multi-Arch: same
 Description: Secure and unified container for user passwords.
  Backend to KWallet, the safe desktop-wide storage
diff --git a/debian/libkf5wallet5.symbols b/debian/libkf5wallet5.symbols
index 59bac62..1a9437e 100644
--- a/debian/libkf5wallet5.symbols
+++ b/debian/libkf5wallet5.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4.100.0 amd64
 libKF5Wallet.so.5 libkf5wallet5 #MINVER#
+| libkf5wallet5 #MINVER#, libkf5wallet-bin
  _ZN7KWallet6Wallet10folderListEv at Base 4.96.0
  _ZN7KWallet6Wallet10lockWalletEv at Base 4.96.0
  (subst)_ZN7KWallet6Wallet10openWalletERK7QString{quintptr}NS0_8OpenTypeE at Base 4.96.0
diff --git a/debian/rules b/debian/rules
index 89d155d..973e4ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,5 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
-# remove dependencies on libkf5wallet5 to avoid circular depends
-override_dh_shlibdeps:
-	$(overridden_command) -- -xlibkf5wallet5
-
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5wallet5-dbg

-- 
kwallet packaging