[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:33 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=9ce2c63
The following commit has been merged in the master branch:
commit 9ce2c63ac7d32482a7b4648133edb443794db743
Merge: 8fce8f32051278479072e6b9919cbfadafe69eeb 07cdb7cf2c01fa5b01c40e35f555ee3ade21dcb4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Jan 21 18:39:30 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 9 +
.reviewboardrc | 2 +
CMakeLists.txt | 142 ++
COPYING.GPLv2 | 339 ++++
KTp/CMakeLists.txt | 130 ++
KTp/Declarative/CMakeLists.txt | 32 +
KTp/Declarative/conversation.cpp | 240 +++
KTp/Declarative/conversation.h | 89 +
KTp/Declarative/conversations-model.cpp | 221 ++
KTp/Declarative/conversations-model.h | 82 +
KTp/Declarative/debug.cpp | 20 +
KTp/Declarative/debug.h | 29 +
KTp/Declarative/messages-model.cpp | 387 ++++
KTp/Declarative/messages-model.h | 105 +
KTp/Declarative/pinned-contacts-model.cpp | 278 +++
KTp/Declarative/pinned-contacts-model.h | 80 +
KTp/Declarative/qml-plugins.cpp | 76 +
KTp/Declarative/qml-plugins.h | 35 +
KTp/Declarative/telepathy-manager.cpp | 227 +++
KTp/Logger/CMakeLists.txt | 72 +
KTp/Logger/abstract-logger-plugin.cpp | 58 +
KTp/Logger/abstract-logger-plugin.h | 166 ++
KTp/Logger/debug.cpp | 20 +
KTp/Logger/debug.h | 29 +
KTp/Logger/log-entity.cpp | 123 ++
KTp/Logger/log-entity.h | 113 ++
KTp/Logger/log-manager-private.h | 46 +
KTp/Logger/log-manager.cpp | 171 ++
KTp/Logger/log-manager.h | 158 ++
KTp/Logger/log-message.cpp | 53 +
KTp/Logger/log-message.h | 53 +
KTp/Logger/log-search-hit.cpp | 92 +
KTp/Logger/log-search-hit.h | 89 +
KTp/Logger/pending-logger-dates-impl.cpp | 80 +
KTp/Logger/pending-logger-dates-impl.h | 42 +
KTp/Logger/pending-logger-dates.cpp | 74 +
KTp/Logger/pending-logger-dates.h | 82 +
KTp/Logger/pending-logger-entities-impl.cpp | 72 +
KTp/Logger/pending-logger-entities-impl.h | 41 +
KTp/Logger/pending-logger-entities.cpp | 69 +
KTp/Logger/pending-logger-entities.h | 74 +
KTp/Logger/pending-logger-logs-impl.cpp | 73 +
KTp/Logger/pending-logger-logs-impl.h | 43 +
KTp/Logger/pending-logger-logs.cpp | 77 +
KTp/Logger/pending-logger-logs.h | 87 +
KTp/Logger/pending-logger-operation.cpp | 85 +
KTp/Logger/pending-logger-operation.h | 60 +
KTp/Logger/pending-logger-search-impl.cpp | 64 +
KTp/Logger/pending-logger-search-impl.h | 45 +
KTp/Logger/pending-logger-search.cpp | 65 +
KTp/Logger/pending-logger-search.h | 76 +
KTp/Logger/plugins/CMakeLists.txt | 3 +
KTp/Logger/plugins/tplogger/CMakeLists.txt | 29 +
.../ktploggerplugin_tplogger.desktop.cmake | 90 +
.../plugins/tplogger/pending-tp-logger-dates.cpp | 58 +
.../plugins/tplogger/pending-tp-logger-dates.h | 44 +
.../tplogger/pending-tp-logger-entities.cpp | 61 +
.../plugins/tplogger/pending-tp-logger-entities.h | 43 +
.../plugins/tplogger/pending-tp-logger-logs.cpp | 78 +
.../plugins/tplogger/pending-tp-logger-logs.h | 45 +
.../plugins/tplogger/pending-tp-logger-search.cpp | 56 +
.../plugins/tplogger/pending-tp-logger-search.h | 41 +
KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp | 107 +
KTp/Logger/plugins/tplogger/tp-logger-plugin.h | 56 +
KTp/Logger/plugins/tplogger/utils.cpp | 37 +
KTp/Logger/plugins/tplogger/utils.h | 32 +
KTp/Logger/scrollback-manager.cpp | 175 ++
KTp/Logger/scrollback-manager.h | 71 +
KTp/Models/CMakeLists.txt | 81 +
KTp/Models/abstract-grouping-proxy-model.cpp | 378 ++++
KTp/Models/abstract-grouping-proxy-model.h | 80 +
KTp/Models/accounts-list-model.cpp | 303 +++
KTp/Models/accounts-list-model.h | 80 +
KTp/Models/accounts-tree-proxy-model.cpp | 113 ++
KTp/Models/accounts-tree-proxy-model.h | 53 +
KTp/Models/contacts-filter-model.cpp | 902 +++++++++
KTp/Models/contacts-filter-model.h | 310 +++
KTp/Models/contacts-list-model.cpp | 249 +++
KTp/Models/contacts-list-model.h | 59 +
KTp/Models/contacts-model.cpp | 236 +++
KTp/Models/contacts-model.h | 92 +
KTp/Models/debug.cpp | 20 +
KTp/Models/debug.h | 29 +
KTp/Models/groups-tree-proxy-model.h | 46 +
KTp/Models/kpeopletranslationproxy.cpp | 229 +++
KTp/Models/kpeopletranslationproxy.h | 45 +
KTp/Models/presence-model.cpp | 219 ++
KTp/Models/presence-model.h | 91 +
KTp/Models/rooms-model.cpp | 340 ++++
KTp/Models/rooms-model.h | 144 ++
KTp/Models/text-channel-watcher-proxy-model.h | 61 +
KTp/OTR/CMakeLists.txt | 44 +
KTp/OTR/channel-adapter.cpp | 445 ++++
KTp/OTR/channel-adapter.h | 116 ++
KTp/OTR/channel-proxy-interface.h | 691 +++++++
KTp/OTR/constants.h | 120 ++
KTp/OTR/debug.cpp | 20 +
KTp/OTR/debug.h | 29 +
KTp/OTR/proxy-service-interface.h | 354 ++++
KTp/OTR/types.cpp | 66 +
KTp/OTR/types.h | 81 +
KTp/OTR/utils.h | 51 +
KTp/Widgets/CMakeLists.txt | 73 +
KTp/Widgets/accounts-combo-box.h | 67 +
KTp/Widgets/add-contact-dialog.cpp | 230 +++
KTp/Widgets/add-contact-dialog.h | 64 +
KTp/Widgets/add-contact-dialog.ui | 69 +
KTp/Widgets/contact-grid-dialog.cpp | 159 ++
KTp/Widgets/contact-grid-dialog.h | 68 +
KTp/Widgets/contact-grid-widget.h | 40 +
KTp/Widgets/contact-info-dialog.cpp | 468 +++++
KTp/Widgets/contact-info-dialog.h | 63 +
KTp/Widgets/contact-view-widget.cpp | 284 +++
KTp/Widgets/contact-view-widget.h | 102 +
KTp/Widgets/debug.cpp | 20 +
KTp/Widgets/debug.h | 28 +
KTp/Widgets/join-chat-room-dialog.cpp | 514 +++++
KTp/Widgets/join-chat-room-dialog.h | 86 +
KTp/Widgets/join-chat-room-dialog.ui | 222 ++
KTp/Widgets/notification-config-dialog.cpp | 155 ++
KTp/Widgets/notification-config-dialog.h | 56 +
KTp/Widgets/settings-kcm-dialog.cpp | 70 +
KTp/Widgets/settings-kcm-dialog.h | 45 +
KTp/Widgets/start-chat-dialog.cpp | 161 ++
KTp/Widgets/start-chat-dialog.h | 61 +
KTp/Widgets/start-chat-dialog.ui | 45 +
KTp/abstract-message-filter.cpp | 57 +
KTp/abstract-message-filter.h | 58 +
KTp/account-factory_p.h | 74 +
KTp/actions.cpp | 319 +++
KTp/actions.h | 89 +
KTp/capabilities-hack-private.h | 39 +
KTp/circular-countdown.h | 62 +
KTp/contact-factory.h | 39 +
KTp/contact.cpp | 270 +++
KTp/contact.h | 90 +
KTp/core.cpp | 122 ++
KTp/core.h | 70 +
KTp/debug.cpp | 56 +
KTp/debug.h | 39 +
KTp/error-dictionary.cpp | 248 +++
KTp/error-dictionary.h | 48 +
KTp/global-contact-manager.cpp | 211 ++
KTp/global-contact-manager.h | 68 +
KTp/global-presence.cpp | 353 ++++
KTp/global-presence.h | 155 ++
KTp/ktp-debug.h | 29 +
KTp/logs-importer-private.cpp | 372 ++++
KTp/logs-importer-private.h | 77 +
KTp/logs-importer.h | 89 +
KTp/message-context.h | 52 +
KTp/message-escape-filter.cpp | 91 +
KTp/message-filter-config-manager.cpp | 131 ++
KTp/message-filter-config-manager.h | 54 +
KTp/message-processor.cpp | 214 ++
KTp/message-processor.h | 76 +
KTp/message.cpp | 201 ++
KTp/message.h | 170 ++
KTp/outgoing-message.cpp | 78 +
KTp/outgoing-message.h | 71 +
KTp/pending-wallet.h | 45 +
KTp/persistent-contact.cpp | 130 ++
KTp/persistent-contact.h | 78 +
KTp/presence.cpp | 136 ++
KTp/presence.h | 88 +
KTp/service-availability-checker.cpp | 112 ++
KTp/service-availability-checker.h | 57 +
KTp/telepathy-handler-application.cpp | 187 ++
KTp/telepathy-handler-application.h | 69 +
KTp/text-parser.h | 95 +
KTp/types.h | 121 ++
KTp/wallet-interface.cpp | 294 +++
KTp/wallet-interface.h | 102 +
KTp/wallet-utils.h | 36 +
KTpConfig.cmake.in | 10 +
cmake/modules/FindLibOTR.cmake | 39 +
cmake/modules/Findtelepathy-accounts-signon.cmake | 18 +
data/CMakeLists.txt | 2 +
data/icons/128-apps-telepathy-kde.png | Bin 0 -> 16974 bytes
data/icons/16-actions-im-groupwise.png | Bin 0 -> 449 bytes
data/icons/16-actions-im-irc.png | Bin 0 -> 757 bytes
data/icons/16-actions-im-local-xmpp.png | Bin 0 -> 1953 bytes
data/icons/16-apps-telepathy-kde.png | Bin 0 -> 840 bytes
data/icons/22-actions-im-aim.png | Bin 0 -> 1107 bytes
data/icons/22-actions-im-facebook.png | Bin 0 -> 1152 bytes
data/icons/22-actions-im-gadugadu.png | Bin 0 -> 1317 bytes
data/icons/22-actions-im-google-talk.png | Bin 0 -> 900 bytes
data/icons/22-actions-im-groupwise.png | Bin 0 -> 513 bytes
data/icons/22-actions-im-icq.png | Bin 0 -> 1664 bytes
data/icons/22-actions-im-jabber.png | Bin 0 -> 1071 bytes
data/icons/22-actions-im-local-xmpp.png | Bin 0 -> 3020 bytes
data/icons/22-actions-im-msn.png | Bin 0 -> 1631 bytes
data/icons/22-actions-im-qq.png | Bin 0 -> 1447 bytes
data/icons/22-actions-im-skype.png | Bin 0 -> 1251 bytes
data/icons/22-actions-im-yahoo.png | Bin 0 -> 1622 bytes
data/icons/22-actions-show-offline.png | Bin 0 -> 1138 bytes
data/icons/22-actions-sort-name.png | Bin 0 -> 925 bytes
data/icons/22-actions-sort-presence.png | Bin 0 -> 1064 bytes
data/icons/22-apps-telepathy-kde.png | Bin 0 -> 1342 bytes
data/icons/32-actions-im-aim.png | Bin 0 -> 1706 bytes
data/icons/32-actions-im-facebook.png | Bin 0 -> 1667 bytes
data/icons/32-actions-im-gadugadu.png | Bin 0 -> 2124 bytes
data/icons/32-actions-im-google-talk.png | Bin 0 -> 1437 bytes
data/icons/32-actions-im-groupwise.png | Bin 0 -> 700 bytes
data/icons/32-actions-im-icq.png | Bin 0 -> 2764 bytes
data/icons/32-actions-im-irc.png | Bin 0 -> 1422 bytes
data/icons/32-actions-im-jabber.png | Bin 0 -> 1614 bytes
data/icons/32-actions-im-local-xmpp.png | Bin 0 -> 5333 bytes
data/icons/32-actions-im-msn.png | Bin 0 -> 2642 bytes
data/icons/32-actions-im-qq.png | Bin 0 -> 2338 bytes
data/icons/32-actions-im-skype.png | Bin 0 -> 1930 bytes
data/icons/32-actions-im-yahoo.png | Bin 0 -> 2375 bytes
data/icons/32-apps-telepathy-kde.png | Bin 0 -> 2073 bytes
data/icons/48-actions-im-aim.png | Bin 0 -> 3679 bytes
data/icons/48-actions-im-facebook.png | Bin 0 -> 3208 bytes
data/icons/48-actions-im-gadugadu.png | Bin 0 -> 3877 bytes
data/icons/48-actions-im-google-talk.png | Bin 0 -> 3261 bytes
data/icons/48-actions-im-groupwise.png | Bin 0 -> 1428 bytes
data/icons/48-actions-im-icq.png | Bin 0 -> 4443 bytes
data/icons/48-actions-im-jabber.png | Bin 0 -> 3482 bytes
data/icons/48-actions-im-local-xmpp.png | Bin 0 -> 10037 bytes
data/icons/48-actions-im-msn.png | Bin 0 -> 4360 bytes
data/icons/48-actions-im-qq.png | Bin 0 -> 4279 bytes
data/icons/48-actions-im-skype.png | Bin 0 -> 2999 bytes
data/icons/48-actions-im-yahoo.png | Bin 0 -> 4198 bytes
data/icons/48-apps-telepathy-kde.png | Bin 0 -> 3871 bytes
data/icons/64-apps-telepathy-kde.png | Bin 0 -> 5642 bytes
data/icons/CMakeLists.txt | 55 +
data/icons/sc-apps-telepathy-kde.svgz | Bin 0 -> 8276 bytes
data/ktelepathy.notifyrc | 2122 ++++++++++++++++++++
debian/changelog | 143 +-
debian/control | 74 +-
debian/copyright | 106 +-
debian/kde-telepathy-kpeople.install | 12 +-
debian/libktp-dev.install | 10 +-
debian/libktpcommoninternals9.symbols | 851 ++++----
debian/libktplogger9.symbols | 380 ++--
debian/libktpmodels9.symbols | 644 +++---
debian/libktpotr9.symbols | 254 +--
debian/libktpwidgets9.symbols | 414 ++--
debian/qml-module-org-kde-telepathy.install | 2 +-
debian/rules | 5 +-
debian/watch | 3 +-
kaccounts/CMakeLists.txt | 29 +
kaccounts/kaccounts-ktp-plugin.cpp | 382 ++++
kaccounts/kaccounts-ktp-plugin.h | 58 +
kpeople/CMakeLists.txt | 3 +
kpeople/actionsplugin/CMakeLists.txt | 10 +
kpeople/actionsplugin/kpeople-actions-plugin.cpp | 337 ++++
kpeople/actionsplugin/kpeople-actions-plugin.h | 40 +
kpeople/actionsplugin/ktp_kpeople_plugin.json | 18 +
kpeople/datasourceplugin/CMakeLists.txt | 12 +
kpeople/datasourceplugin/debug.cpp | 20 +
kpeople/datasourceplugin/debug.h | 29 +
.../datasourceplugin/im-persons-data-source.cpp | 375 ++++
kpeople/datasourceplugin/im-persons-data-source.h | 37 +
.../im_persons_data_source_plugin.json | 18 +
kpeople/uiplugins/CMakeLists.txt | 10 +
kpeople/uiplugins/chatplugin/CMakeLists.txt | 8 +
.../uiplugins/chatplugin/kpeople_chat_plugin.cpp | 165 ++
kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h | 47 +
.../uiplugins/chatplugin/kpeople_chat_plugin.json | 18 +
kpeople/uiplugins/imdetailswidget.cpp | 86 +
kpeople/uiplugins/imdetailswidget.h | 37 +
kpeople/uiplugins/imdetailswidgetplugin.json | 17 +
otr-proxy/KTpProxy/CMakeLists.txt | 37 +
otr-proxy/KTpProxy/ktp-proxy-debug.cpp | 21 +
otr-proxy/KTpProxy/ktp-proxy-debug.h | 29 +
otr-proxy/KTpProxy/main.cpp | 92 +
otr-proxy/KTpProxy/otr-config.cpp | 76 +
otr-proxy/KTpProxy/otr-config.h | 45 +
otr-proxy/KTpProxy/otr-constants.h | 60 +
otr-proxy/KTpProxy/otr-manager.cpp | 621 ++++++
otr-proxy/KTpProxy/otr-manager.h | 120 ++
otr-proxy/KTpProxy/otr-message.cpp | 195 ++
otr-proxy/KTpProxy/otr-message.h | 83 +
otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 523 +++++
otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h | 125 ++
otr-proxy/KTpProxy/otr-proxy-channel.cpp | 77 +
otr-proxy/KTpProxy/otr-proxy-channel.h | 75 +
otr-proxy/KTpProxy/otr-session.cpp | 419 ++++
otr-proxy/KTpProxy/otr-session.h | 151 ++
otr-proxy/KTpProxy/otr-utils.cpp | 96 +
otr-proxy/KTpProxy/otr-utils.h | 94 +
otr-proxy/KTpProxy/pending-curry-operation.cpp | 37 +
otr-proxy/KTpProxy/pending-curry-operation.h | 39 +
otr-proxy/KTpProxy/proxy-observer.cpp | 64 +
otr-proxy/KTpProxy/proxy-observer.h | 48 +
otr-proxy/KTpProxy/proxy-service-adaptee.cpp | 155 ++
otr-proxy/KTpProxy/proxy-service-adaptee.h | 78 +
otr-proxy/KTpProxy/proxy-service.cpp | 202 ++
otr-proxy/KTpProxy/proxy-service.h | 86 +
otr-proxy/KTpProxy/types.h | 33 +
otr-proxy/data/CMakeLists.txt | 7 +
...eedesktop.Telepathy.Client.KTp.Proxy.service.in | 3 +
otr-proxy/test/CMakeLists.txt | 37 +
otr-proxy/test/lib/CMakeLists.txt | 7 +
otr-proxy/test/lib/test-config.cpp | 50 +
otr-proxy/test/lib/test-config.h | 44 +
otr-proxy/test/lib/test-session.cpp | 48 +
otr-proxy/test/lib/test-session.h | 44 +
otr-proxy/test/otr-test.cpp | 955 +++++++++
otr-proxy/test/utils-test.cpp | 75 +
tests/CMakeLists.txt | 47 +
tests/contact-list-model-view-main.cpp | 77 +
tests/kpeople-model-view-main.cpp | 72 +
tests/model-view.cpp | 135 ++
tests/roles-proxy-model.cpp | 170 ++
tools/debugger/CMakeLists.txt | 26 +
tools/debugger/debug-message-view.cpp | 246 +++
tools/debugger/main-window.cpp | 102 +
tools/debugger/main.cpp | 55 +
312 files changed, 32361 insertions(+), 1470 deletions(-)
diff --cc debian/changelog
index 76a98bf,933d700..f88f718
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,89 +1,113 @@@
-ktp-common-internals (15.12.0-1) UNRELEASED; urgency=medium
+ktp-common-internals (15.12.0-1~) UNRELEASED; urgency=medium
+
+ [ Harald Sitter ]
+ * KDE Frameworks 5 port
+ + rename lib packages for sobump
+ + rename -dev package to libktp-dev to match the cmake config one
+ would be looking for. Also it contains more than one library anyway.
+ + rename -dbg to libktp-dbg to align with the dev and also because it
+ affects more than one lib
+ + Add all library packages as possibly depends for the dbg package. Any
+ one of them may be neeeded depending on the app one wants to debug.
+ + Remove kde-telepathy-kpeople for now as kpeople is not released.
+ + Rename kde-telepathy-declarative to qml-module-org-kde-telepathy to
+ align with the implicit naming policy for qml modules in Qt5 (no
+ conflicts)
+ + Update watch file. The source now is released as part of applications.
+
++ [ Scarlett Clark ]
++ * This needs libtelepathy-logger-qt5-dev it is a kf5 app.
++ * Remove the non existant version dep for above.
++ * Try libtelepthy-logger-qt-dev again.
++ * OTR requires telepathy-qt5 >= 0.9.5
+
- * New upstream release.
++ [ Diane Trout ]
+ * Remove all 4 relicensing patches, applied upstream.
+
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 06 Jan 2016 16:54:43 -0800
++ [ Maximiliano Curia ]
++ * New upstream release (15.12.0).
++
++ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:16:32 +0100
+
+ ktp-common-internals (15.08.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 21:18:53 -0800
+
+ ktp-common-internals (15.08.2-3) unstable; urgency=medium
+
+ * Add kaccounts-integration dependes to libktpcommoninternals9
+
+ -- Diane Trout <diane at ghic.org> Tue, 10 Nov 2015 10:12:44 -0800
+
+ ktp-common-internals (15.08.2-2) unstable; urgency=medium
+
+ * Update libktpcommoninternals9 qt logger dependency to
+ libtelepathy-logger-qt5 (>= 15.04) (Closes: #804409)
+ * Change Diane Trouts email address back. (ease of SPAM filtering)
+ * Add telepathy-accounts-signon dependency to libktpcommoninternals9,
+ which is needed to integrate with kaccounts system.
+ * Confirm symbols on other architectures.
+
+ -- Diane Trout <diane at ghic.org> Mon, 09 Nov 2015 11:33:33 -0800
+
+ ktp-common-internals (15.08.2-1) unstable; urgency=medium
+
+ * Apply homepage update patch from Matthew Cope
+ * Update Diane Trout's email address.
+ * Update watchfile for kde-telepathys inclusion in KDE Applications.
+ * New upstream release.
+ * Update library package names to match new SONAME.
+ * Rename library packages to remove the "private" suffix.
+ * Replace old symbols files with new ones for the new SONAME.
+ * Update build-dependencies according to cmake rules.
+ - Add extra-cmake-modules, qtdeclarative5-dev,
+ libkf5coreaddons-dev, libkf5notifcations-dev, kio-dev,
+ libkf5widgetsaddons-dev, libkf5kcmutils-dev,
+ libkf5notifyconfig-dev, libkf5texteditor-dev, libkf5wallet-dev,
+ libkf5config-dev libkf5windowsystem-dev, libkf5iconthemes-dev,
+ libaccounts-qt5-dev >= 1.10
+ qtdeclarative5-dev, libtelepathy-logger-qt-dev, libkaccounts-dev,
+ libsignon-qt5-dev, libkf5kpeople
+ * Update date range and add Aleix Pols last name in the copyright file.
+ * 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.
+ * Remove unused blocks KTp/ktp-export.h and po/* from copyright file.
+ * Rename liblktpcommoninterals-dev to libktp-dev
+ * 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.
+ * Rename libktpcommoninternals-dbg to libktp-dbg to match -dev file
+ * Use dhmk from pkg-kde-tools to build ktp.
+ - Change maintainer to debian-qt-kde
+ - Update debian/rules
+ * Add breaks/replaces libktpotrprivate9 to help migrate to new name
+ * Add KDE's unstable download url to watch file
+ * Update symbols files to be compatible with GCC-5
+ * Update kde-telepathy-kepople.install to rules track kpeople related plugins
+ * Add dh_install --list-missing to make sure everything is installed.
+ * Break/Replace libktpotrprivate8.
+ * Add patches listed below to deal with various licensing issues.
+ These have all been submitted upstream/accepted upstream.
+ - 0001-Relicense-invalid-license-to-LGPL-2.1.patch
+ - 0002-Relicense-invalid-license-to-LGPL-2.1.patch
+ - 0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch
+ - 0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch
+ See:
+ https://git.reviewboard.kde.org/r/125780/
+ https://git.reviewboard.kde.org/r/125923/
+ https://git.reviewboard.kde.org/r/125925/
+ * Update copyright file to match the above licensing fixes.
+
+ -- Diane Trout <diane at debian.org> Fri, 06 Nov 2015 21:27:53 -0800
+
+ ktp-common-internals (0.9.0-1) unstable; urgency=medium
+
[ Jonathan Riddell ]
* New upstream release
* Merge with Debian, no changes
@@@ -39,62 -108,8 +132,27 @@@
* Update Standards-Version to 3.9.6.0. No changes needed.
* Update debian/watch file.
- [ Maximiliano Curia ]
- * New upstream release (15.04.1).
- * New upstream release (15.04.2).
- * New upstream release (15.08.0).
- * New upstream release (15.08.1).
- * New upstream release (15.08.2).
- * New upstream release (15.08.3).
- * New upstream release (15.12.0).
-
- -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:16:32 +0100
-
- ktp-common-internals (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
-
- [ Harald Sitter ]
- * KDE Frameworks 5 port
- + rename lib packages for sobump
- + rename -dev package to libktp-dev to match the cmake config one
- would be looking for. Also it contains more than one library anyway.
- + rename -dbg to libktp-dbg to align with the dev and also because it
- affects more than one lib
- + Add all library packages as possibly depends for the dbg package. Any
- one of them may be neeeded depending on the app one wants to debug.
- + Remove kde-telepathy-kpeople for now as kpeople is not released.
- + Rename kde-telepathy-declarative to qml-module-org-kde-telepathy to
- align with the implicit naming policy for qml modules in Qt5 (no
- conflicts)
- + Update watch file. The source now is released as part of applications.
-
- [ Scarlett Clark ]
- * New upstream release
- * This needs libtelepathy-logger-qt5-dev it is a kf5 app.
- * Remove the non existant version dep for above.
- * Try libtelepthy-logger-qt-dev again.
- * OTR requires telepathy-qt5 >= 0.9.5
-
- -- Scarlett Clark <sgclark at kubuntu.org> Wed, 13 May 2015 22:35:47 -0700
+ -- Diane Trout <diane at ghic.org> Sat, 25 Apr 2015 19:30:59 -0700
+ktp-common-internals (0.9.0-0ubuntu3) vivid; urgency=medium
+
+ * kde-telepathy-kpeople breaks/replaces old kde-telepathy-data
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 05 Nov 2014 12:27:52 +0100
+
+ktp-common-internals (0.9.0-0ubuntu2) vivid; urgency=medium
+
+ * Make -dev package depend on libktpotrprivate8
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 03 Nov 2014 16:10:47 +0100
+
+ktp-common-internals (0.9.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 28 Oct 2014 13:14:01 +0100
+
ktp-common-internals (0.8.1-4) unstable; urgency=medium
* Make sure telepathy-logger is installed (Closes: #774552)
@@@ -143,66 -158,6 +201,55 @@@ ktp-common-internals (0.7.0-1) unstable
-- Diane Trout <diane at ghic.org> Tue, 05 Nov 2013 09:54:57 -0800
+ktp-common-internals (0.8.1-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release (LP: #1313611)
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Mon, 28 Apr 2014 15:35:35 +0200
+
+ktp-common-internals (0.8.0-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Tue, 01 Apr 2014 12:59:21 +0200
+
+ktp-common-internals (0.7.80-0ubuntu2) trusty; urgency=medium
+
+ * Bump KPeople requirement
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Tue, 18 Feb 2014 17:22:20 +0100
+
+ktp-common-internals (0.7.80-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Tue, 18 Feb 2014 00:12:31 +0100
+
+ktp-common-internals (0.7.1-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Wed, 29 Jan 2014 19:44:32 +0100
+
+ktp-common-internals (0.7.0-0ubuntu1) trusty; urgency=low
+
+ * New upstream release
+ * Release packaging from debian experimental git
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Mon, 28 Oct 2013 18:03:20 +0100
+
- ktp-common-internals (0.6.80-1) UNRELEASED; urgency=low
-
- * Imported upstream 0.6.80
- * Ship new libraries libktploggerprivate.
- * Ship plugins imdetailswidgetplugin, im_persons_data_source_plugin,
- ktploggerplugin, ktp_kpeople_plugin, nepomuktelepathyservice
- * Bump libktpcommoninternalsprivate SONAME to 6
- * Add desktop and service files for new plugins
-
- -- Diane Trout <diane at ghic.org> Tue, 24 Sep 2013 21:26:49 -0700
-
+ktp-common-internals (0.6.3-1fakesync1ubuntu1) saucy; urgency=low
+
+ * kde-telepathy-declarative replaces/breaks libktpcommoninternalsprivate5
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 21 Aug 2013 15:56:17 +0100
+
+ktp-common-internals (0.6.3-1fakesync1) saucy-proposed; urgency=low
+
+ * Fake sync due to mismatching orig tarball (LP: #1212826).
+
+ -- Jackson Doak <noskcaj at ubuntu.com> Wed, 21 Aug 2013 12:49:46 +0200
+
ktp-common-internals (0.6.3-1) unstable; urgency=low
* Imported Upstream version 0.6.3
diff --cc debian/control
index 3645369,baaef56..ba11eba
--- a/debian/control
+++ b/debian/control
@@@ -1,50 -1,47 +1,51 @@@
Source: ktp-common-internals
+Section: libs
Priority: optional
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), cmake,
- pkg-kde-tools,
- extra-cmake-modules (>= 0.11),
- qtdeclarative5-dev,
- kdelibs5-dev,
- kdepimlibs5-dev,
- kio-dev,
- libaccounts-qt5-dev (>= 1.10),
- libgcrypt11-dev,
- libotr5-dev,
- libtelepathy-qt5-dev (>= 0.9.5),
- libtelepathy-logger-qt-dev (>= 15.04),
- libtelepathy-logger-dev,
- libkaccounts-dev,
- libkf5config-dev,
- libkf5coreaddons-dev,
- libkf5kcmutils-dev,
- libkf5iconthemes-dev,
- libkf5notifications-dev,
- libkf5notifyconfig-dev,
- libkf5people-dev (>= 0.5.0),
- libkf5texteditor-dev,
- libkf5wallet-dev,
- libkf5widgetsaddons-dev,
- libkf5windowsystem-dev,
- libsignon-qt5-dev,
+Uploaders: Diane Trout <diane at ghic.org>,
+ Michał Zając <quintasan at kubuntu.org>,
+ Mark Purcell <msp at debian.org>
+Build-Depends: cmake (>= 2.8.12~),
+ debhelper (>= 9),
+ doxygen,
+ extra-cmake-modules (>= 5~),
+ gettext,
+ kio-dev (>= 5.11~),
+ libaccounts-qt5-dev (>= 1.10~),
+ libgcrypt20-dev,
- libkaccounts-dev,
++ libsignon-qt5-dev,
++ libkaccounts-qt5-dev,
+ libkf5config-dev (>= 5.11~),
+ libkf5coreaddons-dev (>= 5.11~),
+ libkf5iconthemes-dev (>= 5.11~),
+ libkf5kcmutils-dev (>= 5.11~),
+ libkf5notifications-dev (>= 5.11~),
+ libkf5notifyconfig-dev (>= 5.11~),
+ libkf5people-dev (>= 5.11~),
+ libkf5texteditor-dev (>= 5.11~),
+ libkf5wallet-dev (>= 5.11~),
+ libkf5widgetsaddons-dev (>= 5.11~),
+ libkf5windowsystem-dev (>= 5.11~),
+ libotr5-dev (>= 4.0.0~),
- libtelepathy-logger-qt-dev (>= 0.9.80),
++ libtelepathy-logger-qt-dev (>= 15.04),
+ libtelepathy-qt5-dev (>= 0.9.5),
+ pkg-kde-tools (>> 0.15.15),
+ qtbase5-dev (>= 5.4),
+ qtdeclarative5-dev (>= 5.4)
Standards-Version: 3.9.6
-Section: libs
-Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-common-internals
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git
+Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-common-internals
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/ktp-common-internals.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/ktp-common-internals.git
++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/ktp-common-internals.git
++Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/ktp-common-internals.git
Package: libktp-dev
Section: libdevel
Architecture: any
Depends: libktpcommoninternals9 (= ${binary:Version}),
- libktpwidgets9 (= ${binary:Version}),
- libktplogger9 (= ${binary:Version}),
- libktpotr9 (= ${binary:Version}),
- ${misc:Depends}
+ libktplogger9 (= ${binary:Version}),
+ libktpotr9 (= ${binary:Version}),
+ libktpwidgets9 (= ${binary:Version}),
- libtelepathy-logger-qt-dev (>= 0.9.80),
++ libtelepathy-logger-qt-dev (>= 15.04),
+ ${misc:Depends}
Breaks: libktpcommoninternalsprivate-dev (<< 15.03.80)
Replaces: libktpcommoninternalsprivate-dev (<< 15.03.80)
Description: KDE Telepathy internal library - Development headers
@@@ -58,31 -55,14 +59,16 @@@
outside of the KDE Telepathy project umbrella. This package
is only provided for compiling the rest of the components.
- Package: kde-telepathy-kpeople
- Section: kde
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Description: kpeople plugins for kde-telepathy
- This allows grouping multiple IM accounts into meta-contacts.
- .
- This contains plugins to work with libkpeople.
-
- Package: kde-telepathy-kaccounts
- Section: kde
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Description: kaccounts plugins for kde-telepathy
- This links kde telepathy to kaccounts and vice versa, allowing migrating
- settings from telepathy internal storage to a system-wide shared accounts
- management system.
- .
- This contains plugins to work with kaccounts.
-
Package: libktpcommoninternals9
-Replaces: libktpcommoninternalsprivate6 (<< 0.7.80)
-Breaks: libktpcommoninternalsprivate6 (<< 0.7.80)
Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
+ Depends: ${shlibs:Depends}, ${misc:Depends}, libkf5people5 (>= 0.3.0),
+ libtelepathy-logger-qt5 (>= 15.04),
+ kaccounts-integration (>= 15.04),
+ telepathy-accounts-signon
+Recommends: kde-telepathy-kaccounts (= ${binary:Version}),
+ kde-telepathy-kpeople (= ${binary:Version})
++Replaces: libktpcommoninternalsprivate6 (<< 0.7.80)
++Breaks: libktpcommoninternalsprivate6 (<< 0.7.80)
Description: KDE Telepathy common internal library
Internal library which consists of the most reused
parts across KDE Telepathy.
@@@ -108,8 -88,10 +94,9 @@@ Description: KDE Telepathy common inter
This also includes common widgets like the contact grid.
Package: libktplogger9
- Architecture: any
+ Breaks: libktploggerprivate7 (<< 0.8.80~)
+ Replaces: libktploggerprivate7 (<< 0.8.80~)
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, telepathy-logger
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: KDE Telepathy internal logger library
Internal library which consists of the most reused
parts across KDE Telepathy.
@@@ -147,21 -130,43 +136,42 @@@ Description: Shared data for all the KD
translations.
Package: libktp-dbg
-Architecture: any
Section: debug
Priority: extra
-Breaks: libktpcommoninternals-dbg (<< 15.03)
-Replaces: libktpcommoninternals-dbg (<< 15.03)
-Depends: libktpcommoninternals9 (= ${binary:Version}), ${misc:Depends}
+Architecture: any
- Depends: libktpcommoninternals9 (= ${binary:Version}) | libktplogger9 (= ${binary:Version}) | libktpmodels9 (= ${binary:Version}) | libktpotr9 (= ${binary:Version}) | libktpwidgets9 (= ${binary:Version}),
++Depends: libktpcommoninternals9 (= ${binary:Version}),
+ ${misc:Depends}
Description: KDE Telepathy internal library - debug symbols
Internal library which consists of the most reused
parts across KDE Telepathy.
.
This package contains debugging symbols for the ktp-common-internals library.
+ Package: kde-telepathy-kpeople
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Breaks: kde-telepathy-data (<< 0.9.0)
+ Replaces: kde-telepathy-data (<< 0.9.0)
+ Description: kpeople plugins for kde-telepathy
+ This contains plugins to allow kde-telepathy to use kpeople,
+ This is necessary for grouping multiple IM accounts into
+ meta-contacts.
+
+ Package: kde-telepathy-kaccounts
+ Section: kde
+ Architecture: any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+ Description: kaccounts plugins for kde-telepathy
+ This links KDE telepathy to kaccounts and vice versa, allowing migrating
+ settings from telepathy internal storage to a system-wide shared accounts
+ management system.
+ .
+ This contains plugins to work with kaccounts.
+
Package: kde-telepathy-debugger
-Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Debugging tool for KDE Telepathy
This package contains a GUI debugging tool which can be used to debug
issues in Telepathy.
diff --cc debian/libktp-dev.install
index f69c7ab,c230f4a..72b2821
--- a/debian/libktp-dev.install
+++ b/debian/libktp-dev.install
@@@ -1,3 -1,3 +1,7 @@@
- usr/include/*
- usr/lib/*/cmake/KTp/*
-usr/include/KTp/*
--usr/lib/*/lib*.so
-usr/lib/*/cmake/KTp/KTp*.cmake
++usr/include/KTp/
++usr/lib/*/cmake/KTp/
++usr/lib/*/libKTpLogger.so
++usr/lib/*/libKTpCommonInternals.so`
++usr/lib/*/libKTpModels.so
++usr/lib/*/libKTpOTR.so
++usr/lib/*/libKTpWidgets.so
diff --cc debian/qml-module-org-kde-telepathy.install
index 9ee8396,c3c062b..f74f10a
--- a/debian/qml-module-org-kde-telepathy.install
+++ b/debian/qml-module-org-kde-telepathy.install
@@@ -1,1 -1,2 +1,1 @@@
- usr/lib/*/qt5/qml/org/kde/telepathy/*
-usr/lib/*/qt5/qml/org/kde/telepathy/libktpqmlplugin.so
-usr/lib/*/qt5/qml/org/kde/telepathy/qmldir
++usr/lib/*/qt5/qml/org/kde/telepathy/
diff --cc debian/watch
index 0afb8cb,a1cf7c4..98c9b28
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,3 +1,3 @@@
version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-common-internals-([\d.]+)\.tar\.xz
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-common-internals-([\d.]+).tar.(?:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-common-internals-([\d.]+).tar.(?:bz2|xz)
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-common-internals-([\d.]+)\.tar\.(?:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-common-internals-([\d.]+)\.tar\.(?:bz2|xz)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list