[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/0.9.0-1-10-gccb8499

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-kded-integration-module.git;a=commitdiff;h=ccb8499

The following commit has been merged in the master branch:
commit ccb8499be90642a20728cbf9a05fbd20fa8ed86e
Author: Diane Trout <diane at ghic.org>
Date:   Wed Jul 22 19:46:09 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-integration-module.install |  9 ++++-----
 debian/rules                                    | 13 +++++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d109c2..8ed03f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ ktp-kded-integration-module (15.04.3-1) UNRELEASED; urgency=medium
     - Remove po/* block
   * Update build-dpends for change to KF5 and rename
     libktpcommoninternalsprivate-dev to libktp-dev
+  * 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 debian.org>  Sun, 12 Jul 2015 19:44:16 -0700
 
diff --git a/debian/control b/debian/control
index a4ca2cb..f26dadc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ktp-kded-integration-module
 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 debian.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-integration-module.install b/debian/kde-telepathy-integration-module.install
index 1549330..bc69733 100644
--- a/debian/kde-telepathy-integration-module.install
+++ b/debian/kde-telepathy-integration-module.install
@@ -1,6 +1,5 @@
-usr/lib/kde4/kded_ktp_integration_module.so
-usr/lib/kde4/kcm_ktp_integration_module.so
+usr/lib/*/qt5/plugins/kded_ktp_integration_module.so
+usr/lib/*/qt5/plugins/kcm_ktp_integration_module.so
 usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service
-usr/share/kde4/services/kded/kded_ktp_integration_module.desktop
-usr/share/kde4/services/kcm_ktp_integration_module.desktop
-usr/share/locale/*
+usr/share/kservices5/kded/ktp_integration_module.desktop
+usr/share/kservices5/kcm_ktp_integration_module.desktop
diff --git a/debian/rules b/debian/rules
index 18a229d..3d3e264 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --parallel --with kde --dbg-package=kde-telepathy-integration-module-dbg --list-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-integration-module-dbg
+
+override_dh_install:
+	$(overridden_command) --fail-missing
+
+#override_dh_auto_configure:
+#	dh_auto_configure -- -DDBUS_SEND_PATH=/usr/bin/dbus-send

-- 
ktp-kded-integration-module packaging