[SCM] kcalc packaging branch, kubuntu_unstable, updated. debian/14.12.2-1-8-g3abf686

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kcalc.git;a=commitdiff;h=3abf686

The following commit has been merged in the kubuntu_unstable branch:
commit 3abf6866b69c090780cba2cd10663ebf388c469e
Merge: 43ad86aef78b5eb5d7fde9b67455eb52d006f7f2 0f4aad4e7bdbc9e9796bfc8413d7076d340d6c32
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 10 10:51:17 2015 +0100

    Merge branch 'kubuntu_vivid_archive' into kubuntu_unstable

 debian/.gitattributes |  1 +
 debian/changelog      | 12 ++++++++++++
 debian/control        |  4 ++--
 debian/rules          |  4 +++-
 debian/watch          |  1 -
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --cc debian/rules
index a1760e8,29eee40..9ca54cc
--- a/debian/rules
+++ b/debian/rules
@@@ -1,5 -1,7 +1,7 @@@
  #!/usr/bin/make -f
  
 -include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
- .PHONY: override_dh_auto_test
+ override_dh_auto_test:
+ 	# Disable dh_auto_test at build time
+ 	:

-- 
kcalc packaging