[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-157-g3ee7b4d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=1c0f18f

The following commit has been merged in the master branch:
commit 1c0f18fbd2172c736db382b4c9bd38de1ddd7e8a
Author: Diane Trout <diane at ghic.org>
Date:   Fri Jul 17 22:12:20 2015 -0700

    Switch to --with kf5. Update several plugin paths to $arch/qt5/plugin.
---
 debian/changelog                            | 1 +
 debian/kde-telepathy-kaccounts.install      | 2 +-
 debian/kde-telepathy-kpeople.install        | 8 ++++----
 debian/libktplogger9.install                | 3 ++-
 debian/qml-module-org-kde-telepathy.install | 4 ++--
 debian/rules                                | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dad2001..db3beda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ ktp-common-internals (15.04.3-1) UNRELEASED; urgency=medium
   * Rename kde-telepathy-declarative to qml-module-org-kde-telepathy
   * Add kde-telepathy-kaccounts package.
   * Use --fail-missing to make it easier to find not installed files.
+  * Switch to --with kf5. Update several plugin paths to $arch/qt5/plugin.
 
  -- Diane Trout <diane at debian.org>  Sat, 04 Jul 2015 09:50:32 -0700
 
diff --git a/debian/kde-telepathy-kaccounts.install b/debian/kde-telepathy-kaccounts.install
index 35ef38a..133d883 100644
--- a/debian/kde-telepathy-kaccounts.install
+++ b/debian/kde-telepathy-kaccounts.install
@@ -1 +1 @@
-usr/lib/*/plugins/kaccounts/daemonplugins/kaccounts_ktp_plugin.so
+usr/lib/*/qt5/plugins/kaccounts/daemonplugins/kaccounts_ktp_plugin.so
diff --git a/debian/kde-telepathy-kpeople.install b/debian/kde-telepathy-kpeople.install
index 3eca00f..78e8192 100644
--- a/debian/kde-telepathy-kpeople.install
+++ b/debian/kde-telepathy-kpeople.install
@@ -1,7 +1,7 @@
-usr/lib/*/plugins/im_persons_data_source_plugin.so
-usr/lib/*/plugins/imdetailswidgetplugin.so
-usr/lib/*/plugins/kpeople_chat_plugin.so
-usr/lib/*/plugins/ktp_kpeople_plugin.so
+usr/lib/*/qt5/plugins/im_persons_data_source_plugin.so
+usr/lib/*/qt5/plugins/imdetailswidgetplugin.so
+usr/lib/*/qt5/plugins/kpeople_chat_plugin.so
+usr/lib/*/qt5/plugins/ktp_kpeople_plugin.so
 usr/share/kservices5/im_persons_data_source_plugin.desktop
 usr/share/kservices5/imdetailswidgetplugin.desktop
 usr/share/kservices5/kpeople_chat_plugin.desktop
diff --git a/debian/libktplogger9.install b/debian/libktplogger9.install
index d4ade47..a512019 100644
--- a/debian/libktplogger9.install
+++ b/debian/libktplogger9.install
@@ -1,3 +1,4 @@
 usr/lib/*/libKTpLogger.so.15.*
 usr/lib/*/libKTpLogger.so.9
-usr/lib/*/plugins/ktploggerplugin_tplogger.so
\ No newline at end of file
+usr/lib/*/qt5/plugins/ktploggerplugin_tplogger.so
+
diff --git a/debian/qml-module-org-kde-telepathy.install b/debian/qml-module-org-kde-telepathy.install
index e50e213..c3c062b 100644
--- a/debian/qml-module-org-kde-telepathy.install
+++ b/debian/qml-module-org-kde-telepathy.install
@@ -1,2 +1,2 @@
-usr/lib/*/qml/org/kde/telepathy/libktpqmlplugin.so
-usr/lib/*/qml/org/kde/telepathy/qmldir
+usr/lib/*/qt5/qml/org/kde/telepathy/libktpqmlplugin.so
+usr/lib/*/qt5/qml/org/kde/telepathy/qmldir
diff --git a/debian/rules b/debian/rules
index 97f6695..cfbb550 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel --with kde --dbg-package=libktpcommoninternals-dbg --fail-missing
+	dh $@ --parallel --with kf5 --dbg-package=libktpcommoninternals-dbg --fail-missing
 
 override_dh_auto_test:
 

-- 
ktp-common-internals packaging