[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/0.7.0-1-69-g704c67b
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:55:20 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=fffe109
The following commit has been merged in the master branch:
commit fffe109b719a340158730aabf6b2816b61fbb6a6
Merge: dcd921e2e946e72f5c257d621ed62c2ceb088272 a17d4175af70ad0016507b16f84da2ced5041336
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 26 10:39:10 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 8 +
.reviewboardrc | 2 +
CMakeLists.txt | 93 ++++
COPYING | 502 +++++++++++++++++++++
Messages.sh | 4 +
autoaway.cpp | 112 +++++
autoaway.h | 55 +++
autoconnect.cpp | 62 +++
autoconnect.h | 99 ++++
cmake/modules/COPYING-CMAKE-SCRIPTS | 22 +
cmake/modules/FindKTp.cmake | 38 ++
config/CMakeLists.txt | 32 ++
config/column-resizer.cpp | 216 +++++++++
config/column-resizer.h | 54 +++
config/kcm_ktp_integration_module.desktop | 108 +++++
config/nowplaying-lineedit.cpp | 80 ++++
config/nowplaying-lineedit.h | 43 ++
config/nowplaying-listwidget.cpp | 107 +++++
config/nowplaying-listwidget.h | 50 ++
config/telepathy-kded-config.cpp | 402 +++++++++++++++++
config/telepathy-kded-config.h | 61 +++
config/telepathy-kded-config.ui | 465 +++++++++++++++++++
contact-cache.cpp | 333 ++++++++++++++
contact-cache.h | 63 +++
contact-request-handler.cpp | 480 ++++++++++++++++++++
contact-request-handler.h | 64 +++
contactnotify.cpp | 134 ++++++
contactnotify.h | 46 ++
debian/changelog | 44 +-
debian/control | 12 +-
debian/copyright | 55 +--
debian/kde-telepathy-integration-module.install | 9 +-
debian/rules | 13 +-
debian/watch | 3 +-
error-handler.cpp | 231 ++++++++++
error-handler.h | 69 +++
ktp_integration_module.desktop | 98 ++++
ktp_kded_debug.cpp | 21 +
ktp_kded_debug.h | 26 ++
...thy.Client.KTp.KdedIntegrationModule.service.in | 3 +
screensaveraway.cpp | 87 ++++
screensaveraway.h | 50 ++
status-handler.cpp | 209 +++++++++
status-handler.h | 73 +++
telepathy-kded-module-plugin.cpp | 50 ++
telepathy-kded-module-plugin.h | 71 +++
telepathy-module.cpp | 74 +++
telepathy-module.h | 65 +++
telepathy-mpris.cpp | 320 +++++++++++++
telepathy-mpris.h | 67 +++
tests/CMakeLists.txt | 39 ++
tests/contact-cache-main.cpp | 33 ++
tests/status-handling-main.cpp | 47 ++
53 files changed, 5447 insertions(+), 57 deletions(-)
diff --cc CMakeLists.txt
index 0000000,d7bde73..7ae3549
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,93 +1,93 @@@
+ project(ktp-kded-integration-module)
+
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+
+ # KDE Application Version, managed by release script
+ set(KDE_APPLICATIONS_VERSION_MAJOR "15")
-set(KDE_APPLICATIONS_VERSION_MINOR "08")
-set(KDE_APPLICATIONS_VERSION_MICRO "3")
++set(KDE_APPLICATIONS_VERSION_MINOR "12")
++set(KDE_APPLICATIONS_VERSION_MICRO "1")
+ set(KTP_KDED_MODULE_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+
+ cmake_policy(SET CMP0002 OLD)
+
+ set(IS_KTP_INTERNAL_MODULE TRUE)
+
+ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH})
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ include(FeatureSummary)
+
+ find_package (Qt5 REQUIRED COMPONENTS Concurrent Widgets Sql Network)
+ find_package (KF5 REQUIRED COMPONENTS DBusAddons WidgetsAddons Config I18n KIO Notifications ConfigWidgets IdleTime KCMUtils)
+
+ find_package (KTp REQUIRED)
+
+ # Add an option for building tests
+ option(ENABLE_TESTS "Enable compilation of tests" FALSE)
+
+ add_definitions (-DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_KEYWORDS
+ -DTRANSLATION_DOMAIN=\"kded_ktp_integration_module\"
+ )
+
+ include_directories (${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+
+ set (kded_ktp_integration_module_SRCS
+ ktp_kded_debug.cpp
+ contact-cache.cpp
+ contact-request-handler.cpp
+ telepathy-kded-module-plugin.cpp
+ telepathy-module.cpp
+ autoaway.cpp
+ telepathy-mpris.cpp
+ status-handler.cpp
+ autoconnect.cpp
+ error-handler.cpp
+ contactnotify.cpp
+ screensaveraway.cpp
+ )
+
+ add_library (kded_ktp_integration_module MODULE ${kded_ktp_integration_module_SRCS}
+ )
+
+ target_link_libraries (kded_ktp_integration_module
+ KTp::CommonInternals
+ KTp::Widgets
+ KF5::DBusAddons
+ KF5::ConfigGui
+ KF5::ConfigCore
+ KF5::I18n
+ KF5::Notifications
+ KF5::IdleTime
+ KF5::KIOWidgets
+ KF5::WidgetsAddons
+ ${TELEPATHY_QT5_LIBRARIES}
+ Qt5::Concurrent
+ Qt5::Sql
+ Qt5::Network
+ )
+
+ install (TARGETS kded_ktp_integration_module
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+ )
+
+ install (FILES ktp_integration_module.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/kded
+ )
+
+ find_file(DBUS_SEND_PATH dbus-send HINTS /usr/bin)
+ configure_file(org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service
+ DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+
+ add_subdirectory(config)
+
+ if(ENABLE_TESTS)
+ add_subdirectory(tests)
+ endif()
diff --cc config/kcm_ktp_integration_module.desktop
index 0000000,9fc95a3..c7cc83d
mode 000000,100644..100644
--- a/config/kcm_ktp_integration_module.desktop
+++ b/config/kcm_ktp_integration_module.desktop
@@@ -1,0 -1,108 +1,108 @@@
+ [Desktop Entry]
+ Icon=preferences-other
+ StartupNotify=true
+ Terminal=false
+ Type=Service
+ X-KDE-ServiceTypes=KCModule
+ X-DBUS-StartupType=
+ X-KDE-HasReadOnlyMode=false
+ X-KDE-Library=kcm_ktp_integration_module
+ X-KDE-ParentApp=kcontrol
+ X-KDE-SubstituteUID=false
+ X-KDE-RootOnly=false
+ X-KDE-System-Settings-Parent-Category=im-and-voip
+ Categories=Qt;KDE;X-KDE-settings-network;
+
+ Name=General
+ Name[ar]=عامّ
+ Name[ast]=Xeneral
+ Name[bs]=Općenito
+ Name[ca]=General
+ Name[ca at valencia]=General
+ Name[cs]=Obecné
+ Name[da]=Generelt
+ Name[de]=Allgemein
+ Name[el]=Γενικά
+ Name[en_GB]=General
+ Name[es]=General
+ Name[et]=Üldine
+ Name[fi]=Yleistä
+ Name[fr]=Général
+ Name[ga]=Ginearálta
+ Name[gl]=Xeral
+ Name[hu]=Általános
+ Name[ia]=General
+ Name[it]=Generali
+ Name[kk]=Жалпы
+ Name[km]=ទូទៅ
+ Name[ko]=일반
+ Name[lt]=Bendrai
+ Name[mr]=सामान्य
+ Name[nb]=Generelt
+ Name[nds]=Allmeen
+ Name[nl]=Algemeen
+ Name[pa]=ਆਮ
+ Name[pl]=Ogólne
+ Name[pt]=Geral
+ Name[pt_BR]=Geral
+ Name[ro]=General
+ Name[ru]=Основное
+ Name[sk]=Všeobecné
+ Name[sl]=Splošno
+ Name[sr]=Опште
+ Name[sr at ijekavian]=Опште
+ Name[sr at ijekavianlatin]=Opšte
+ Name[sr at latin]=Opšte
+ Name[sv]=Allmänt
+ Name[tr]=Genel
+ Name[ug]=ئادەتتىكى
+ Name[uk]=Загальне
+ Name[wa]=Djenerå
+ Name[x-test]=xxGeneralxx
+ Name[zh_CN]=常规
+ Name[zh_TW]=一般的
+ Comment=General settings for Instant Messaging and VoIP
+ Comment[ast]=Axustes xenerales pa la mensaxería nel intre y VoIP
+ Comment[bs]=Opšte postavke za instant poruke i VoIP
+ Comment[ca]=Arranjament general per la missatgeria instantània i VoIP
+ Comment[ca at valencia]=Arranjament general per la missatgeria instantània i VoIP
+ Comment[cs]=Obecná nastavení pro IM a VOIP
+ Comment[da]=Generelle indstillinger for instant messaging og VoIP
+ Comment[de]=Allgemeine Einstellungen für Instant Messaging und VoIP
+ Comment[el]=Γενικές ρυθμίσεις για στιγμιαία μηνύματα και VoIP
+ Comment[en_GB]=General settings for Instant Messaging and VoIP
+ Comment[es]=Preferencias generales para mensajería instantánea y VoIP
+ Comment[et]=Kiirsuhtluse ja VoIP üldised seadistused
+ Comment[fi]=Pikaviestinnän ja VoIPin yleisasetukset
+ Comment[fr]=Paramètres généraux de messagerie instantanée et de VoIP
+ Comment[ga]=Socruithe ginearálta le haghaidh Teachtaireachtaí Meandaracha agus VoIP
+ Comment[gl]=Opcións xerais da mensaxería instantánea e a voz por internet
+ Comment[hu]=Az azonnali üzenetküldés és VoIP általános beállításai
+ Comment[ia]=Preferentias general per Messageria instantanee e VoIP
+ Comment[it]=Impostazioni generali per messaggistica e VoIP
+ Comment[kk]=Лезде хабарласу мен VoIP жалпы баптауы
+ Comment[km]=ការកំណត់ទូទៅសម្រាប់ការផ្ញើសារបន្ទាន់ និង VoIP
+ Comment[ko]=인스턴트 메시지 및 VoIP 일반 설정
-Comment[lt]=Bendri Pokalbių ir VoIP nustatymai
++Comment[lt]=Bendros pokalbių ir VoIP nuostatos
+ Comment[nb]=Generelle instillinger for lynmeldinger og VoIP
+ Comment[nds]=Allmeen Instellen för Kortnarichten un VoIP
+ Comment[nl]=Algemene instellingen voor Instant Messaging en VoIP
+ Comment[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਅਤੇ VoIP ਲਈ ਆਮ ਸੈਟਿੰਗ
+ Comment[pl]=Ogólne ustawienia dla komunikatora internetowego i VoIP
+ Comment[pt]=Configuração geral das Mensagens Instantâneas e VoIP
+ Comment[pt_BR]=Configurações gerais de mensagens instantâneas e VoIP
+ Comment[ro]=Configurări generale pentru mesageria instantanee și VoIP
+ Comment[ru]=Основные параметры системы обмена сообщениями
+ Comment[sk]=Všeobecné nastavenia pre Instant Messaging a VoIP
+ Comment[sl]=Splošne nastavitve za hipno sporočanje in VoIP
+ Comment[sr]=Опште поставке брзог гласништва и ВоИП‑а
+ Comment[sr at ijekavian]=Опште поставке брзог гласништва и ВоИП‑а
+ Comment[sr at ijekavianlatin]=Opšte postavke brzog glasništva i VoIP‑a
+ Comment[sr at latin]=Opšte postavke brzog glasništva i VoIP‑a
+ Comment[sv]=Allmänna inställningar för direktmeddelanden och Internettelefon
+ Comment[tr]=Anında Mesajlaşma ve VoIP için genel ayarlar
+ Comment[uk]=Загальні параметри мереж спілкування та голосового інтернет-зв’язку
+ Comment[wa]=Apontiaedjes po tot costé del Messaedjreye sol moumint et del VoIP
+ Comment[x-test]=xxGeneral settings for Instant Messaging and VoIPxx
+ Comment[zh_CN]=即时通讯和 IP 电话的常规设置
+ Comment[zh_TW]=即時訊息與 VoIP 的一般設定
diff --cc debian/changelog
index 8a6495c,8fd1ef1..a8ea405
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,38 +1,53 @@@
+ktp-kded-integration-module (15.12.1-1~) UNRELEASED; urgency=medium
+
- [ Diane Trout ]
- * New upstream release.
- * Bump telepathy-qt build-dep to 0.9.5
- * Bump libktpcommoninternalsprivate build-dep to 0.8.80
- * Change kde-telepathy-data dependency to source:Upstream-Version
-
+ [ Maximiliano Curia ]
+ * Update watch file.
+ * New upstream release (15.04.1).
+ * New upstream release (15.04.2).
+ * New upstream release (15.08.0).
+ * New upstream release (15.08.1).
+ * Bump Standards-Version to 3.9.6.
+ * New upstream release (15.08.2).
+ * New upstream release (15.12.1).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 26 Jan 2016 10:33:51 +0100
+
+ ktp-kded-integration-module (15.08.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 23:01:00 -0800
+
+ ktp-kded-integration-module (15.08.2-1) unstable; urgency=medium
+
+ * Apply homepage update patch from Matthew Cope
+ * Update watch file for KTp's move to Applications.
+ * New upstream release.
+ * Update copyright file.
+ - Add LGPL-2 block
+ - 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.
+ * Add KDE's unstable download url to watch file
+
+ -- Diane Trout <diane at ghic.org> Sat, 07 Nov 2015 10:58:43 -0800
+
+ ktp-kded-integration-module (0.9.0-1) unstable; urgency=medium
+
++ [ Diane Trout ]
+ * New upstream release.
+ * Bump telepathy-qt build-dep to 0.9.5
+ * Bump libktpcommoninternalsprivate build-dep to 0.9.0
+ * Update Standards-Version to 3.9.6. No changes needed.
+ * Update copyright file.
+ * Update debian/watch file to use http://download.kde.org
+
+ -- Diane Trout <diane at ghic.org> Sat, 25 Apr 2015 20:06:27 -0700
+
ktp-kded-integration-module (0.8.1-1) unstable; urgency=medium
* New upstream release.
@@@ -47,7 -62,7 +77,7 @@@ ktp-kded-integration-module (0.6.3-1) u
* Update Standards-Version to 3.9.4. No changes needed.
* Update watch file as KDE-Telepathy is now in KDE stable.
-- [ Mark Purcell ]
++ [ Mark Purcell ]
* Imported Upstream version 0.6.3
* Add myself to Uploaders
* Update Build-Depends: libktpcommoninternalsprivate-dev (>= 0.6.3)
diff --cc debian/control
index 4a84a7a,becd85a..f9fd48d
--- a/debian/control
+++ b/debian/control
@@@ -1,29 -1,28 +1,31 @@@
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 ghic.org>, Michał Zając <quintasan at kubuntu.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 9),
- pkg-kde-tools (>= 0.9),
- libtelepathy-qt5-dev (>= 0.9.5),
- libtelepathy-logger-qt-dev,
- cmake (>= 2.8),
- extra-cmake-modules (>= 1.3.0),
- kio-dev,
- libktp-dev (>= 15.04),
- libkf5dbusaddons-dev,
- libkf5widgetsaddons-dev,
- libkf5config-dev,
- libkf5i18n-dev,
- libkf5notifications-dev,
- libkf5configwidgets-dev,
- libkf5idletime-dev,
- libkf5kcmutils-dev,
- libkf5wallet-dev,
- qtbase5-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),
+ extra-cmake-modules (>= 1.3.0~),
+ kio-dev,
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5dbusaddons-dev,
+ libkf5i18n-dev,
+ libkf5idletime-dev,
+ libkf5kcmutils-dev,
+ libkf5notifications-dev,
++ libkf5wallet-dev,
+ libkf5widgetsaddons-dev,
+ libktp-dev,
+ libktpcommoninternalsprivate-dev (>= 0.8.80),
- libtelepathy-qt4-dev (>= 0.9.5),
++ libtelepathy-qt5-dev (>= 0.9.5),
++ libtelepathy-logger-qt-dev,
+ pkg-kde-tools (>= 0.9),
+ qtbase5-dev (>= 5.4)
Standards-Version: 3.9.6
- Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-kded-module
+ Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-kded-module
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-kded-integration-module.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-kded-integration-module.git
diff --cc debian/watch
index 21ec275,d9fce9b..a8a69b6
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,4 @@@
version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+).tar.(?x:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+).tar.(?x:bz2|xz)
+
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+)\.tar\.xz
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+)\.tar\.(?x:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+)\.tar\.(?x:bz2|xz)
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list