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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jan 21 19:28:26 UTC 2016


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

The following commit has been merged in the master branch:
commit 56ffd359d9b441b7762ca440627025ac3d455a44
Author: Diane Trout <diane at ghic.org>
Date:   Mon Jul 6 21:21:45 2015 -0700

    Update install paths to the new KF5 locations. e.g. out of /usr/share/kde4, libraries into multi-arch directories, and the new SONAME library filenames.
---
 debian/changelog                                |  3 +++
 debian/kde-telepathy-data.install               |  9 ++++-----
 debian/kde-telepathy-declarative.install        |  4 ++--
 debian/kde-telepathy-kpeople.install            | 15 +++++++--------
 debian/libktpcommoninternals9.install           |  4 ++--
 debian/libktpcommoninternalsprivate-dev.install |  2 +-
 debian/libktplogger9.install                    |  6 +++---
 debian/libktpmodels9.install                    |  4 ++--
 debian/libktpotr9.install                       |  9 ++++-----
 debian/libktpwidgets9.install                   |  4 ++--
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a611864..389147f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ ktp-common-internals (15.04.3-1) UNRELEASED; urgency=medium
   * Change kpeople build dependiency to libkf5people-dev (>= 0.5.0)
   * Change build-depends telepathy-qt and telepathy-logger-qt to qt5
     versions.
+  * Update install paths to the new KF5 locations.
+    e.g. out of /usr/share/kde4, libraries into multi-arch directories,
+    and the new SONAME library filenames.
 
  -- Diane Trout <diane at debian.org>  Sat, 04 Jul 2015 09:50:32 -0700
 
diff --git a/debian/kde-telepathy-data.install b/debian/kde-telepathy-data.install
index 233bb0a..b481964 100644
--- a/debian/kde-telepathy-data.install
+++ b/debian/kde-telepathy-data.install
@@ -1,6 +1,5 @@
 usr/share/icons/hicolor/*
-usr/share/kde4/apps/ktelepathy/*
-usr/share/kde4/apps/katepart/syntax/ktpdebugoutput.xml
-usr/share/kde4/services/ktploggerplugin_tplogger.desktop
-usr/share/kde4/servicetypes/ktp_logger_plugin.desktop
-usr/share/locale/*
+usr/share/katepart5/syntax/ktpdebugoutput.xml
+usr/share/knotifications5/ktelepathy.notifyrc
+usr/share/kservices5/ktploggerplugin_tplogger.desktop
+usr/share/kservicetypes5/ktp_logger_plugin.desktop
diff --git a/debian/kde-telepathy-declarative.install b/debian/kde-telepathy-declarative.install
index 983f9b1..e50e213 100644
--- a/debian/kde-telepathy-declarative.install
+++ b/debian/kde-telepathy-declarative.install
@@ -1,2 +1,2 @@
-usr/lib/kde4/imports/org/kde/telepathy/libktpqmlplugin.so
-usr/lib/kde4/imports/org/kde/telepathy/qmldir
+usr/lib/*/qml/org/kde/telepathy/libktpqmlplugin.so
+usr/lib/*/qml/org/kde/telepathy/qmldir
diff --git a/debian/kde-telepathy-kpeople.install b/debian/kde-telepathy-kpeople.install
index f5cedd9..8e8a426 100644
--- a/debian/kde-telepathy-kpeople.install
+++ b/debian/kde-telepathy-kpeople.install
@@ -1,8 +1,7 @@
-usr/lib/kde4/imdetailswidgetplugin.so
-usr/lib/kde4/im_persons_data_source_plugin.so
-usr/lib/kde4/ktp_kpeople_plugin.so
-usr/lib/kde4/kpeople_chat_plugin.so
-usr/share/kde4/services/imdetailswidgetplugin.desktop
-usr/share/kde4/services/im_persons_data_source_plugin.desktop
-usr/share/kde4/services/ktp_kpeople_plugin.desktop
-usr/share/kde4/services/kpeople_chat_plugin.desktop
+usr/lib/*/plugins/imdetailswidgetplugin.so
+usr/lib/*/plugins/im_persons_data_source_plugin.so
+usr/lib/*/plugins/ktp_kpeople_plugin.so
+usr/lib/*/plugins/kpeople_chat_plugin.so
+usr/share/kservices5/ktp_kpeople_plugin.desktop
+usr/share/kservices5/im_persons_data_source_plugin.desktop
+usr/share/kservices5/kpeople_chat_plugin.desktop
diff --git a/debian/libktpcommoninternals9.install b/debian/libktpcommoninternals9.install
index 0ba1aaf..0e6fbea 100644
--- a/debian/libktpcommoninternals9.install
+++ b/debian/libktpcommoninternals9.install
@@ -1,2 +1,2 @@
-usr/lib/libktpcommoninternalsprivate.so.0.9*
-usr/lib/libktpcommoninternalsprivate.so.8
+usr/lib/*/libKTpCommonInternals.so.15.*
+usr/lib/*/libKTpCommonInternals.so.9
\ No newline at end of file
diff --git a/debian/libktpcommoninternalsprivate-dev.install b/debian/libktpcommoninternalsprivate-dev.install
index b341905..f3800aa 100644
--- a/debian/libktpcommoninternalsprivate-dev.install
+++ b/debian/libktpcommoninternalsprivate-dev.install
@@ -1,2 +1,2 @@
 usr/include/*
-usr/lib/lib*.so
+usr/lib/*/lib*.so
diff --git a/debian/libktplogger9.install b/debian/libktplogger9.install
index 61c8b93..d4ade47 100644
--- a/debian/libktplogger9.install
+++ b/debian/libktplogger9.install
@@ -1,3 +1,3 @@
-usr/lib/libktploggerprivate.so.0.9*
-usr/lib/libktploggerprivate.so.8
-usr/lib/kde4/ktploggerplugin_tplogger.so
+usr/lib/*/libKTpLogger.so.15.*
+usr/lib/*/libKTpLogger.so.9
+usr/lib/*/plugins/ktploggerplugin_tplogger.so
\ No newline at end of file
diff --git a/debian/libktpmodels9.install b/debian/libktpmodels9.install
index 2a1efae..92a0fd9 100644
--- a/debian/libktpmodels9.install
+++ b/debian/libktpmodels9.install
@@ -1,2 +1,2 @@
-usr/lib/libktpmodelsprivate.so.0.9*
-usr/lib/libktpmodelsprivate.so.8
\ No newline at end of file
+usr/lib/*/libKTpModels.so.15.*
+usr/lib/*/libKTpModels.so.9
\ No newline at end of file
diff --git a/debian/libktpotr9.install b/debian/libktpotr9.install
index e33929c..78cff55 100644
--- a/debian/libktpotr9.install
+++ b/debian/libktpotr9.install
@@ -1,7 +1,6 @@
-usr/lib/libktpotrprivate.so.8
-usr/lib/libktpotrprivate.so.0.9*
-usr/lib/kde4/libexec/ktp-proxy
-usr/share/kde4/config.kcfg/ktp-proxy-config.kcfg
+usr/lib/*/libKTpOTR.so.15*
+usr/lib/*/libKTpOTR.so.9*
+usr/lib/*/libexec/ktp-proxy
+usr/share/config.kcfg/ktp-proxy-config.kcfg
 usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.Proxy.service
 usr/share/telepathy/clients/KTp.Proxy.client
-
diff --git a/debian/libktpwidgets9.install b/debian/libktpwidgets9.install
index 836ba68..0c12364 100644
--- a/debian/libktpwidgets9.install
+++ b/debian/libktpwidgets9.install
@@ -1,2 +1,2 @@
-usr/lib/libktpwidgetsprivate.so.0.9*
-usr/lib/libktpwidgetsprivate.so.8
+usr/lib/*/libKTpWidgets.so.15.*
+usr/lib/*/libKTpWidgets.so.9

-- 
ktp-common-internals packaging



More information about the pkg-kde-commits mailing list