[SCM] kwallet-pam packaging branch, kubuntu_unstable, updated. 3a308459f803fed63e389ae944b0684cefcde494

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwallet-pam.git;a=commitdiff;h=3a30845

The following commit has been merged in the kubuntu_unstable branch:
commit 3a308459f803fed63e389ae944b0684cefcde494
Merge: 65b1fa2ddcae172b0e9a4a59610be7eed0bb9ca3 f9b571dbce28f50d252e82c82c515d7d085a2b27
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Aug 10 16:16:00 2015 +0200

    merge

 debian/control | 6 +++++-
 debian/rules   | 5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --cc debian/rules
index 6cc7306,46b6cf8..404230b
--- a/debian/rules
+++ b/debian/rules
@@@ -1,9 -1,8 +1,8 @@@
  #!/usr/bin/make -f
  
- QT4_BUILD_DIR = build-qt4
+ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
- %:
- 	dh $@ 
 -QT5_BUILD_DIR = build-qt5
++QT4_BUILD_DIR = build-qt4
  
  override_dh_auto_clean:
  	dh_auto_clean

-- 
kwallet-pam packaging