[SCM] ksshaskpass packaging branch, kubuntu_stable, updated. 0aab3aafd02cb506e15db6e91c38b505745b6545

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/ksshaskpass.git;a=commitdiff;h=f4d4d91

The following commit has been merged in the kubuntu_stable branch:
commit f4d4d9111da0cd7c720f1941f19b83a2bf360b57
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 12 14:41:07 2015 +0100

    New upstream release.
    
    * New upstream release.
    * Drop now useless dirs file
    * Use pkg-kde-tools in rules
    * Update lintian-override
    * Bump dh compat to 9
    * Set maintainer to Debian/Kubuntu, retain origin maintainer as XSBC field
---
 debian/changelog         | 14 ++++++++++++++
 debian/compat            |  2 +-
 debian/control           |  9 +++++----
 debian/dirs              |  1 -
 debian/lintian-overrides |  2 +-
 debian/rules             |  8 +-------
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3abcdb..c54c2b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ksshaskpass (5.1.95-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Sergey Popov ]
+  * New upstream release.
+
+  [ Harald Sitter ]
+  * Drop now useless dirs file
+  * Use pkg-kde-tools in rules
+  * Update lintian-override
+  * Bump dh compat to 9
+  * Set maintainer to Debian/Kubuntu, retain origin maintainer as XSBC field
+
+ -- Sergey Popov <sergobot256 at gmail.com>  Fri, 09 Jan 2015 19:39:21 +0300
+
 ksshaskpass (0.5.3-1build2) precise; urgency=low
 
   * Rebuild for the kdebase-runtime transition
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 649748d..ee45a64 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: ksshaskpass
 Section: utils
 Priority: optional
-Maintainer: Armin Berres <armin+debian at space-based.de>
-Build-Depends: debhelper (>= 7.3), kdelibs5-dev, cmake
-Standards-Version: 3.8.3
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+XSBC-Original-Maintainer: Armin Berres <armin+debian at space-based.de>
+Build-Depends: debhelper (>= 9), cmake, qtbase5-dev, extra-cmake-modules, libkf5wallet-dev, libkf5widgetsaddons-dev, libkf5coreaddons-dev, libkf5i18n-dev, pkg-kde-tools
+Standards-Version: 3.9.5
 Homepage: http://www.kde-apps.org/content/show.php/show.php?content=50971
 
 Package: ksshaskpass
@@ -12,4 +13,4 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client
 Recommends: kwalletmanager
 Provides: ssh-askpass
 Description: interactively prompt users for a passphrase for ssh-add
- A KDE 4 version of ssh-askpass with KWallet support.
+ A version of ssh-askpass with KWallet support.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 24d22e4..9d892b4 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,2 +1,2 @@
 # ksshaskpass is not called directly
-desktop-command-not-in-package /usr/share/applications/kde4/ksshaskpass.desktop /usr/bin/ssh-add
+ksshaskpass: desktop-command-not-in-package usr/share/applications/org.kde.ksshaskpass.desktop usr/bin/ssh-add
diff --git a/debian/rules b/debian/rules
index 757af77..4c9ce6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
 
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-		-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-		-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
-
-%:
-	dh --buildsystem=cmake --builddirectory=builddir $@
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 

-- 
ksshaskpass packaging