[SCM] ktp-approver packaging branch, master, updated. debian/0.6.3-1-81-g9d9e2a1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=af4e467

The following commit has been merged in the master branch:
commit af4e4670547d6ab480a9374ff955979eb1384bcf
Author: Diane Trout <diane at ghic.org>
Date:   Tue Jul 21 21:26:38 2015 -0700

    Use dhmk from pkg-kde-tools to build ktp.
    
    * Use dhmk from pkg-kde-tools to build ktp.
      - Change maintainer to debian-qt-kde
      - Update debian/rules
      - Update plugins path to qt5/plugins.
---
 debian/changelog                      |  4 ++++
 debian/control                        |  2 +-
 debian/kde-telepathy-approver.install |  2 +-
 debian/rules                          | 13 +++++++++----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b55198..bf20cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ ktp-approver (15.04.3-1) UNRELEASED; urgency=medium
   * Adjust paths in kde-telepathy-approver for KF5 locations.
   * Use --fail-missing in rules to make it easier for me to find
     whats missing.
+  * Use dhmk from pkg-kde-tools to build ktp.
+    - Change maintainer to debian-qt-kde
+    - Update debian/rules
+    - Update plugins path to qt5/plugins.
 
  -- Diane Trout <diane at ghic.org>  Wed, 27 May 2015 22:55:12 -0700
 
diff --git a/debian/control b/debian/control
index 34b8529..9357a98 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ktp-approver
 Section: kde
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Diane Trout <diane at ghic.org>, Michał Zając <quintasan at kubuntu.org>, Mark Purcell <msp at debian.org>
 Build-Depends: debhelper (>= 9),
  pkg-kde-tools (>= 0.9),
diff --git a/debian/kde-telepathy-approver.install b/debian/kde-telepathy-approver.install
index 5e445d8..ff0c145 100644
--- a/debian/kde-telepathy-approver.install
+++ b/debian/kde-telepathy-approver.install
@@ -1,4 +1,4 @@
-usr/lib/*/plugins/kded_ktp_approver.so
+usr/lib/*/qt5/plugins/kded_ktp_approver.so
 usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.Approver.service
 usr/share/kservices5/kded/ktp_approver.desktop
 usr/share/kservicetypes5/ktp-approver.desktop
diff --git a/debian/rules b/debian/rules
index 9d7811a..ea3385d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --parallel --with kde --dbg-package=kde-telepathy-approver-dbg --fail-missing
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
-override_dh_auto_configure:
-	dh_auto_configure -- -DDBUS_SEND_PATH=/usr/bin/dbus-send
+override_dh_strip:
+	$(overridden_command) --dbg-package=kde-telepathy-approver-dbg
+
+override_dh_install:
+	$(overridden_command) --fail-missing
+
+override_dh_configure:
+	$(overriden_command) -- -DDBUS_SEND_PATH=/usr/bin/dbus-send

-- 
ktp-approver packaging