[SCM] kwallet packaging branch, master, updated. debian/5.13.0-2-1-g35362fe

[Scott Kitterman]

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

The following commit has been merged in the master branch:
commit 35362feb02f359aed090b82342b77b7c254c5b96
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sun Sep 13 16:22:38 2015 -0400

    * Reorder Depends/Recommends in the package so that users with recommends disabled still get a functioning kwallet (Closes: #798724)
---
 debian/changelog | 8 ++++++++
 debian/control   | 7 ++++---
 debian/rules     | 4 ++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a94f42..f074777 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kwallet-kf5 (5.13.0-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Reorder Depends/Recommends in the package so that users with recommends
+    disabled still get a functioning kwallet (Closes: #798724)
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 13 Sep 2015 16:19:46 -0400
+
 kwallet-kf5 (5.13.0-2) unstable; urgency=medium
 
   * Add kf5gpgmepp build dep, to build the gpg backend.
diff --git a/debian/control b/debian/control
index 746fb0a..f5199af 100644
--- a/debian/control
+++ b/debian/control
@@ -44,10 +44,11 @@ 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.
- Interface to KWallet, the safe desktop-wide storage
+ Runtime for interface to KWallet, the safe desktop-wide storage
  for passwords on KDE workspaces.
  .
  Contains the runtime files for kwallet-framework
@@ -55,10 +56,10 @@ Description: Secure and unified container for user passwords.
 Package: libkf5wallet5
 Architecture: any
 Depends: libkf5wallet-data (= ${source:Version}),
+         libkf5wallet-bin (= ${binary:Version}),
          libkwalletbackend5-5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: libkf5wallet-bin (= ${binary:Version})
 Multi-Arch: same
 Description: Secure and unified container for user passwords.
  Interface to KWallet, the safe desktop-wide storage
@@ -79,7 +80,7 @@ Description: Secure and unified container for user passwords.
 Package: libkwalletbackend5-5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libkf5wallet-bin (= ${binary:Version})
+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/rules b/debian/rules
index 973e4ca..89d155d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,9 @@
 
 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