[SCM] ktp-approver packaging branch, master, updated. debian/0.6.3-1-81-g9d9e2a1
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 6 19:26:45 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=9d9e2a1
The following commit has been merged in the master branch:
commit 9d9e2a152825a768852f6ec6bbdddf07a7edf5b4
Merge: e75ed26dc85346822b2b5cf1cf2f91ad7cc67e81 344340a2df5d63c6fffdc5a66b821e749ab512ee
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jan 6 16:44:43 2016 +0100
Merge remote-tracking branch 'deb-ktp-approver/master'
.gitignore | 8 +
.reviewboardrc | 2 +
CMakeLists.txt | 33 ++
COPYING | 502 +++++++++++++++++++++
cmake/modules/COPYING-CMAKE-SCRIPTS | 22 +
debian/changelog | 36 +-
debian/control | 11 +-
debian/copyright | 55 +--
debian/rules | 13 +-
debian/watch | 3 +-
ktp-approver.desktop | 58 +++
src/CMakeLists.txt | 36 ++
src/Messages.sh | 4 +
src/approverdaemon.cpp | 47 ++
src/approverdaemon.h | 34 ++
src/channelapprover.cpp | 45 ++
src/channelapprover.h | 40 ++
src/dispatchoperation.cpp | 108 +++++
src/dispatchoperation.h | 50 ++
src/filetransferchannelapprover.cpp | 89 ++++
src/filetransferchannelapprover.h | 40 ++
src/handlewithcaller.cpp | 101 +++++
src/handlewithcaller.h | 41 ++
src/ktp_approver.desktop | 97 ++++
src/ktp_approver_debug.cpp | 21 +
src/ktp_approver_debug.h | 26 ++
src/ktp_approverrc | 3 +
src/ktpapproverfactory.h | 25 +
src/ktpapprovermodule.cpp | 96 ++++
...esktop.Telepathy.Client.KTp.Approver.service.in | 3 +
src/textchannelapprover.cpp | 121 +++++
src/textchannelapprover.h | 48 ++
src/tubechannelapprover.cpp | 163 +++++++
src/tubechannelapprover.h | 54 +++
version.h.in | 1 +
35 files changed, 1989 insertions(+), 47 deletions(-)
diff --cc CMakeLists.txt
index 0000000,36aa9cd..7404912
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,33 +1,33 @@@
+ project(ktp-approver)
+
+ # 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_APPROVER_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+
+ cmake_policy(SET CMP0002 OLD)
+
+ 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 Widgets Network)
+ find_package (KF5 REQUIRED COMPONENTS DBusAddons Config I18n Notifications Service)
+
+ find_package(TelepathyQt5 REQUIRED)
+
+ include_directories(${TELEPATHY_QT5_INCLUDE_DIR})
+
+ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/version.h @ONLY)
+
+ add_subdirectory(src)
+
+ install(FILES ktp-approver.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --cc debian/changelog
index e4cf7d6,3b324bb..1533cb1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,33 +1,40 @@@
+ktp-approver (15.12.0-1~) UNRELEASED; urgency=medium
+
+ * 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).
- * 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:18:27 +0100
+
+ ktp-approver (15.08.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 21:29:37 -0800
+
+ ktp-approver (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.
+ * Update build dependencies to include:
+ - qtbase5-dev, extra-cmake-modules, libsignon-qt5-dev,
+ libtelepathy-qt5-dev, libtelepathy-logger-qt-dev
+ and several libkf5 libraries.
+ * Update debian/copyright.
+ - Add myself top debian/* copyright.
+ - Add LGPL-2+ block for src/ktp_approver_debug.*
+ - remove po/* block.
+ * Adjust paths in kde-telepathy-approver for KF5 locations.
+ * Use --fail-missing in rules to make it easier for me to find
+ whats missing.
+ * 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:35:45 -0800
+
ktp-approver (0.9.0-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index ef1cf98,9357a98..d2b39b7
--- a/debian/control
+++ b/debian/control
@@@ -1,24 -1,26 +1,29 @@@
Source: ktp-approver
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),
- extra-cmake-modules (>= 1.3.0),
- libtelepathy-qt5-dev (>= 0.9.0),
- libtelepathy-logger-qt-dev,
- qtbase5-dev,
- kio-dev,
- libkf5dbusaddons-dev,
- libkf5kcmutils-dev,
- libkf5config-dev,
- libkf5iconthemes-dev,
- libkf5i18n-dev,
- libkf5notifications-dev,
- libkf5service-dev,
- libsignon-qt5-dev (>= 8.55),
- cmake (>= 2.8),
+Uploaders: Diane Trout <diane at ghic.org>,
+ Michał Zając <quintasan at kubuntu.org>,
+ Mark Purcell <msp at debian.org>,
+ Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake (>= 2.8.12~),
+ debhelper (>= 9),
+ extra-cmake-modules (>= 1.3.0~),
++ kio-dev,
+ libkf5config-dev,
+ libkf5dbusaddons-dev,
+ libkf5i18n-dev,
++ libkf5iconthemes-dev,
++ libkf5kcmutils-dev,
+ libkf5notifications-dev,
+ libkf5service-dev,
- libtelepathy-qt5-dev,
++ libsignon-qt5-dev (>= 8.55),
++ libtelepathy-qt5-dev (>= 0.9.0),
++ 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-approver
+ Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-approver
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-approver.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-approver.git
diff --cc debian/watch
index ed78e31,31d5d7e..0f3a4d3
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,4 @@@
version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-approver-([\d.]+).tar.(?:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-approver-([\d.]+).tar.(?:bz2|xz)
+
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-approver-([\d.]+)\.tar\.xz
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-approver-([\d.]+)\.tar\.(?:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-approver-([\d.]+)\.tr.(?:bz2|xz)
--
ktp-approver packaging
More information about the pkg-kde-commits
mailing list