[SCM] ktp-contact-list packaging branch, master, updated. debian/0.7.0-1-80-g5a16f88
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:57:11 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=5a16f88
The following commit has been merged in the master branch:
commit 5a16f889d396bd2259c343dea6539c2bf31f34db
Merge: 33634a078be215c62dc9a75e4e4d2291de155e34 1dbbdca7a13bba5c297dd4bc9b65fbe10ba63f96
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 26 13:49:17 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 5 +
.reviewboardrc | 2 +
CMakeLists.txt | 110 ++++
COPYING | 339 ++++++++++
Messages.sh | 4 +
abstract-contact-delegate.cpp | 187 ++++++
abstract-contact-delegate.h | 63 ++
contact-delegate-compact.cpp | 208 +++++++
contact-delegate-compact.h | 53 ++
contact-delegate-overlay.cpp | 262 ++++++++
contact-delegate-overlay.h | 137 +++++
contact-delegate.cpp | 227 +++++++
contact-delegate.h | 62 ++
contact-list-widget.cpp | 993 ++++++++++++++++++++++++++++++
contact-list-widget.h | 115 ++++
contact-list-widget_p.h | 60 ++
contact-overlays.cpp | 188 ++++++
contact-overlays.h | 113 ++++
contact-view-hover-button.cpp | 212 +++++++
contact-view-hover-button.h | 74 +++
context-menu.cpp | 640 +++++++++++++++++++
context-menu.h | 75 +++
debian/changelog | 47 +-
debian/control | 11 +-
debian/copyright | 51 +-
debian/kde-telepathy-contact-list.install | 4 +-
debian/rules | 9 +-
debian/watch | 3 +-
dialogs/custom-presence-dialog.cpp | 210 +++++++
dialogs/custom-presence-dialog.h | 67 ++
dialogs/remove-contact-dialog.cpp | 69 +++
dialogs/remove-contact-dialog.h | 55 ++
dialogs/remove-contact-dialog.ui | 255 ++++++++
empty-row-filter.cpp | 43 ++
empty-row-filter.h | 39 ++
filter-bar.cpp | 99 +++
filter-bar.h | 72 +++
global-presence-chooser.cpp | 471 ++++++++++++++
global-presence-chooser.h | 71 +++
ktp-contactlist-debug.cpp | 21 +
ktp-contactlist-debug.h | 27 +
main-widget.cpp | 741 ++++++++++++++++++++++
main-widget.h | 136 ++++
main-widget.ui | 106 ++++
main.cpp | 75 +++
org.kde.ktpcontactlist.desktop | 144 +++++
org.kde.ktpcontactlist.service.in | 4 +
tooltips/contacttooltip.cpp | 122 ++++
tooltips/contacttooltip.h | 50 ++
tooltips/contacttooltip.ui | 150 +++++
tooltips/ktooltip.cpp | 117 ++++
tooltips/ktooltip.h | 48 ++
tooltips/ktooltipwindow.cpp | 92 +++
tooltips/ktooltipwindow_p.h | 44 ++
tooltips/persontooltip.cpp | 138 +++++
tooltips/persontooltip.h | 52 ++
tooltips/persontooltip.ui | 143 +++++
tooltips/tooltipmanager.cpp | 204 ++++++
tooltips/tooltipmanager.h | 83 +++
version.h.in | 1 +
60 files changed, 8132 insertions(+), 71 deletions(-)
diff --cc CMakeLists.txt
index 0000000,5a2cb28..04c0ffe
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,110 +1,110 @@@
+ project (ktp-contactlist)
+
+ cmake_minimum_required(VERSION 2.8.12)
+
+ # 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 "0")
+
+ set(KTP_CONTACT_LIST_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+
+ 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})
+
+ find_package (Qt5 5.0 REQUIRED COMPONENTS Widgets Xml)
+ find_package (KF5 5.11 REQUIRED COMPONENTS DBusAddons KIO KCMUtils Notifications WindowSystem NotifyConfig I18n IconThemes XmlGui KCMUtils People)
+ find_package (TelepathyQt5 0.9.3 REQUIRED)
+ find_package (KTp REQUIRED)
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ include(FeatureSummary)
+
+ set_package_properties(KF5People PROPERTIES DESCRIPTION "KDE Contacts aggregation"
+ TYPE OPTIONAL
+ )
+
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+ if (KF5People_FOUND)
+ add_definitions(-DHAVE_KPEOPLE)
+ endif ()
+
+ set (ktp_contactlist_SRCS
+ contact-list-widget.cpp
+ context-menu.cpp
+ abstract-contact-delegate.cpp
+ contact-view-hover-button.cpp
+ contact-overlays.cpp
+ contact-delegate-overlay.cpp
+ contact-delegate.cpp
+ contact-delegate-compact.cpp
+ empty-row-filter.cpp
+ ktp-contactlist-debug.cpp
+ filter-bar.cpp
+ main.cpp
+ main-widget.cpp
+ global-presence-chooser.cpp
+ dialogs/remove-contact-dialog.cpp
+ dialogs/custom-presence-dialog.cpp
+ tooltips/ktooltip.cpp
+ tooltips/tooltipmanager.cpp
+ tooltips/ktooltipwindow.cpp
+ tooltips/contacttooltip.cpp
+ tooltips/persontooltip.cpp
+ )
+
+ if(KF5People_FOUND)
+ set (ktp_contactlist_LIBS
+ KF5::PeopleWidgets
+ )
+ endif()
+
+ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+ ki18n_wrap_ui(ktp_contactlist_SRCS
+ main-widget.ui
+ dialogs/remove-contact-dialog.ui
+ tooltips/contacttooltip.ui
+ tooltips/persontooltip.ui
+ )
+
+ add_executable (ktp-contactlist ${ktp_contactlist_SRCS})
+
+ target_link_libraries (ktp-contactlist ${ktp_contactlist_LIBS}
+ KF5::KIOWidgets
+ KF5::KCMUtils
+ KF5::NotifyConfig
+ KF5::DBusAddons
+ KF5::I18n
+ KF5::IconThemes
+ KF5::XmlGui
+ KF5::KCMUtils
+ KF5::Notifications
+ KF5::WindowSystem
+ KTp::Models
+ KTp::Widgets
+ KTp::Logger
+ KTp::CommonInternals
+ )
+
+ configure_file(org.kde.ktpcontactlist.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktpcontactlist.service)
+
+
+ # Install:
+ install (TARGETS ktp-contactlist
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
+ )
+
+ install (PROGRAMS org.kde.ktpcontactlist.desktop
+ DESTINATION ${XDG_APPS_INSTALL_DIR}
+ )
+
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktpcontactlist.service
+ DESTINATION ${DBUS_SERVICES_INSTALL_DIR}
+ )
diff --cc debian/changelog
index f144c85,0351370..ab03926
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,37 +1,47 @@@
+ktp-contact-list (15.12.0-1~) UNRELEASED; urgency=medium
+
- [ Diane Trout ]
- * New upstream release.
- * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
- * Change kde-telepathy-data 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.04.3).
- * 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.08.3).
+ * New upstream release (15.12.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:16:25 +0100
+
+ ktp-contact-list (15.08.3-1) unstable; urgency=medium
+
++ [ Diane Trout ]
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 21:37:12 -0800
+
+ ktp-contact-list (15.08.2-1) unstable; urgency=medium
+
+ * Apply homepage update patch from Matthew Cope
+ * Update watch file for KTps move to Applications.
+ * New upstream release.
+ * Use --fail-missing to make it easier to find not installed files.
+ * Update build-depends to use libtelepathy-qt5, libtelepathy-logger-qt-dev,
+ qtbase5, extra-cmake-modules and many kf5 libraries.
+ * Update copyright file, a few modules are now LGPL, the po/* files
+ are somewhere else and I added myself to the debian/ block
+ * Update install paths for ktp-contactlist
+ * Use dhmk from pkg-kde-tools to build ktp.
+ - Change maintainer to debian-qt-kde
+ - Update debian/rules
+ * Add KDE's unstable download url to watch file
+
+ -- Diane Trout <diane at ghic.org> Sat, 07 Nov 2015 10:44:51 -0800
+
+ ktp-contact-list (0.9.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update libktpcommoninternalsprivate-dev 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 19:47:52 -0700
+
ktp-contact-list (0.8.1-2) unstable; urgency=medium
* Add kde-telepathy-kpeople as a dependency to ktp-contactlist
diff --cc debian/control
index 60c155d,4acca3a..0517d19
--- a/debian/control
+++ b/debian/control
@@@ -1,42 -1,36 +1,41 @@@
Source: ktp-contact-list
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),
- qtbase5-dev,
- cmake (>= 2.8),
- extra-cmake-modules,
- kio-dev,
- libtelepathy-logger-dev,
- libtelepathy-logger-qt-dev (>= 0.5.60),
- libtelepathy-qt5-dev (>= 0.9.3),
- libktp-dev (>= 15.04),
- libkf5people-dev (>= 0.5),
- libkf5dbusaddons-dev,
- libkf5kcmutils-dev,
- libkf5notifications-dev,
- libkf5notifyconfig-dev,
- libkf5iconthemes-dev,
- libkf5wallet-dev,
- libkf5windowsystem-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 (>= 5.11~),
+ libkf5dbusaddons-dev (>= 5.11~),
+ libkf5i18n-dev (>= 5.11~),
+ libkf5iconthemes-dev (>= 5.11~),
+ libkf5kcmutils-dev (>= 5.11~),
+ libkf5notifications-dev (>= 5.11~),
+ libkf5notifyconfig-dev (>= 5.11~),
+ libkf5people-dev (>= 5.11~),
++ libkf5wallet-dev,
+ libkf5windowsystem-dev (>= 5.11~),
+ libkf5xmlgui-dev (>= 5.11~),
- libkpeople-dev (>= 0.2.2),
+ libktp-dev,
+ libtelepathy-logger-dev,
- libtelepathy-logger-qt4-dev (>= 0.5.60),
- libtelepathy-qt4-dev (>= 0.9.3),
++ libtelepathy-logger-qt-dev (>= 0.5.60),
+ libtelepathy-qt5-dev (>= 0.9.3~),
+ pkg-kde-tools (>= 0.9),
+ qtbase5-dev (>= 5.4)
Standards-Version: 3.9.6
- Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-contact-list
+ Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-contact-list
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-contact-list.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-contact-list.git
Package: kde-telepathy-contact-list
Architecture: any
- Depends: kde-telepathy-data (>= ${source:Upstream-Version}),
-Depends: ${shlibs:Depends}, ${misc:Depends},
- kde-telepathy-data (>= 0.8.1),
- kde-telepathy-kpeople
++Depends: kde-telepathy-data (>= 0.8.1),
+ kde-telepathy-kpeople,
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: kde-telepathy
Description: Telepathy contact list for the KDE Plasma Desktop
This package provides a contact list application based on telepathy,
diff --cc debian/watch
index a641c34,45f91cd..65574de
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,4 @@@
version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+).tar.(?:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+).tar.(?:bz2|xz)
+
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+)\.tar\.xz
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+)\.tar\.(?:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+)\.tar\.(?:bz2|xz)
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list