[SCM] ktp-auth-handler packaging branch, master, updated. debian/0.7.0-1-78-g049f635
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:56:08 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=049f635
The following commit has been merged in the master branch:
commit 049f63533d848df55216c3c6eba01bd25f9fc614
Merge: c787121cbbe3889b6b01b74e9403584600306f73 202e8a672c4691338c01383eb37062df1f66ac7b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 26 15:35:09 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 8 +
.reviewboardrc | 2 +
CMakeLists.txt | 114 +++++
COPYING | 502 +++++++++++++++++++++
KTp.ConfAuthObserver.client | 7 +
KTp.SASLHandler.client | 8 +
KTp.TLSHandler.client | 7 +
Messages.sh | 4 +
cmake/modules/COPYING-CMAKE-SCRIPTS | 22 +
cmake/modules/FindAccountsQt.cmake | 23 +
cmake/modules/FindSignOnQt.cmake | 20 +
conference-auth-observer.cpp | 81 ++++
conference-auth-observer.h | 54 +++
conference-auth-op.cpp | 116 +++++
conference-auth-op.h | 54 +++
debian/changelog | 51 ++-
debian/control | 5 +-
debian/copyright | 54 +--
debian/kde-telepathy-auth-handler.install | 8 +-
debian/rules | 9 +-
debian/watch | 4 +-
kssl/kssl.h | 169 +++++++
kssl/ksslcertificatemanager.h | 99 ++++
kssl/ksslinfodialog.h | 101 +++++
kssl/ksslsettings.h | 169 +++++++
main.cpp | 112 +++++
...elepathy.Client.KTp.ConfAuthObserver.service.in | 3 +
...top.Telepathy.Client.KTp.SASLHandler.service.in | 3 +
...ktop.Telepathy.Client.KTp.TLSHandler.service.in | 3 +
sasl-auth-op.cpp | 132 ++++++
sasl-auth-op.h | 60 +++
sasl-handler.cpp | 109 +++++
sasl-handler.h | 61 +++
tls-cert-verifier-op.cpp | 275 +++++++++++
tls-cert-verifier-op.h | 73 +++
tls-handler.cpp | 102 +++++
tls-handler.h | 60 +++
types.cpp | 33 ++
types.h | 33 ++
version.h.in | 1 +
x-telepathy-password-auth-operation.cpp | 236 ++++++++++
x-telepathy-password-auth-operation.h | 63 +++
x-telepathy-password-prompt.cpp | 64 +++
x-telepathy-password-prompt.h | 51 +++
x-telepathy-password-prompt.ui | 108 +++++
x-telepathy-sso-google-operation.cpp | 81 ++++
x-telepathy-sso-google-operation.h | 55 +++
47 files changed, 3334 insertions(+), 75 deletions(-)
diff --cc CMakeLists.txt
index 0000000,d5b3052..7f2076f
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,114 +1,114 @@@
+ project(ktp-auth-handler)
+
+ # 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_AUTH_HANDLER_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+
+ find_package(Qt5 5.3 CONFIG REQUIRED COMPONENTS DBus Gui Core Network) #Network for QSsl
+
+ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+
+ find_package(KF5 5.0 REQUIRED COMPONENTS Wallet WidgetsAddons I18n KIO WebKit)
+
+ cmake_policy(SET CMP0002 OLD)
+
+ set(IS_KTP_INTERNAL_MODULE TRUE)
+ find_package (TelepathyQt5 0.8.9 REQUIRED)
+ find_package (KTp REQUIRED)
+ find_package (Qca-qt5 REQUIRED)
+ find_package(AccountsQt5 1.10 REQUIRED CONFIG)
+ find_package(SignOnQt5 8.55 REQUIRED CONFIG)
+ find_package(KAccounts REQUIRED)
+
+ # include (MacroLibrary)
+ #
+ # macro_log_feature(ACCOUNTSQT_FOUND "AccountsQt" "Support for Accounts-SSO" "https://code.google.com/p/accounts-sso/source/checkout?repo=libaccounts-qt" FALSE "" "")
+ # macro_log_feature(SIGNONQT_FOUND "SignonsQt" "Support for Accounts-SSO" "https://code.google.com/p/accounts-sso/source/checkout?repo=signond" FALSE "" "")
+ # macro_display_feature_log()
+ message("-----------------------------------------------------------------------------")
+ message("IMPORTANT: There is a runtime dependency on QCA-OSSL. ")
+ message("This project will build, but will fail to run properly. Please ensure it is installed.")
+ message("If you are a packager you _must_ mark this as a dependency.")
+ message("-----------------------------------------------------------------------------")
+
+ find_package(Qca-qt5-ossl QUIET)
+ set_package_properties(Qca-qt5-ossl PROPERTIES
+ PURPOSE "Runtime-only dependency on the OSSL plugin of QCA for authentication to work properly"
+ TYPE RUNTIME
+ )
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ include(ECMPackageConfigHelpers)
+ include(ECMMarkNonGuiExecutable)
+ include(CMakePackageConfigHelpers)
+ include(FeatureSummary)
+
+ include_directories (${QCA_INCLUDE_DIR}
+ ${ACCOUNTSQT_INCLUDE_DIRS}
+ ${SIGNONQT_INCLUDE_DIRS}
+ )
+
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+ set(ktp_auth_handler_SRCS
+ main.cpp
+ sasl-handler.cpp
+ sasl-auth-op.cpp
+ tls-cert-verifier-op.cpp
+ tls-handler.cpp
+ types.cpp
+ x-telepathy-password-auth-operation.cpp
+ x-telepathy-password-prompt.cpp
+ x-telepathy-sso-google-operation.cpp
+ conference-auth-op.cpp
+ conference-auth-observer.cpp
+ )
+
+ set(ktp_auth_handler_LIBS
+ KTp::CommonInternals
+ qca-qt5
+ ${ACCOUNTSQT_LIBRARIES}
+ ${SIGNONQT_LIBRARIES}
+ KAccounts
+ KF5::WidgetsAddons
+ KF5::Wallet
+ KF5::I18n
+ KF5::KIOCore
+ KF5::KIOWidgets
+ Qt5::Core
+ Qt5::DBus
+ )
+
+ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+ ki18n_wrap_ui(ktp_auth_handler_SRCS x-telepathy-password-prompt.ui)
+ add_executable(ktp-auth-handler ${ktp_auth_handler_SRCS})
+
+ target_link_libraries(ktp-auth-handler
+ ${ktp_auth_handler_LIBS}
+ )
+
+ configure_file(org.freedesktop.Telepathy.Client.KTp.SASLHandler.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service)
+ configure_file(org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service)
+
+ configure_file(org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service)
+
+ install(TARGETS ktp-auth-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service
+ DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service
+ DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+ install(FILES KTp.SASLHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+ install(FILES KTp.TLSHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+ install(FILES KTp.ConfAuthObserver.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
diff --cc debian/changelog
index 791fd5b,7414374..88853b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,40 +1,50 @@@
+ktp-auth-handler (15.12.0-1~) UNRELEASED; urgency=medium
+
- [ Diane Trout ]
- * New upstream release.
- * Update build-depends ktpcommoninteranslprivate-dev to 0.8.80
- * Update kde-telepathy-data version to be set by 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.08.3).
+ * New upstream release (15.12.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:15:19 +0100
+
+ ktp-auth-handler (15.08.3-1) unstable; urgency=medium
+
++ [ Diane Trout ]
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 21:34:42 -0800
+
+ ktp-auth-handler (15.08.2-1) unstable; urgency=medium
+
+ * Apply homepage update patch from Matthew Cope
+ * Update watch file to for KTp's move to applications.
+ * New upstream version. (Closes: #784488)
+ * Update build-depends for the change to KF5.
+ (Move to Qt5 versions and list specific kf5 modules).
+ * Update copyright file. (Translations are in a new package).
+ * Update kde-telepathy-auth-handler for new KF5 locations.
+ * Use --fail-missing to make it easier to find not installed files.
+ * Update for rename of ktpcommoninternalsprivate-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
+ * Remove block in copyright file refering to removed files.
+
+ -- Diane Trout <diane at ghic.org> Sat, 07 Nov 2015 10:40:47 -0800
+
+ ktp-auth-handler (0.9.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update build-depends ktpcommoninteranslprivate-dev to 0.9.0
+ * Update kde-telepathy-data version to be set by source:Upstream-Version
+ * Update copyright file
+ * Update Standards-Version to 3.9.6 No changes needed.
+ * Update debian/watch file to use http://download.kde.org
+
+ -- Diane Trout <diane at ghic.org> Sat, 25 Apr 2015 19:44:41 -0700
+
ktp-auth-handler (0.8.1-1) unstable; urgency=medium
* New upstream release
@@@ -49,7 -66,7 +76,7 @@@ ktp-auth-handler (0.6.3-1) unstable; ur
* Bump build-dep to 0.6.2
* 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 5890a60,f3fbca6..361f34c
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,27 +1,32 @@@
Source: ktp-auth-handler
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),
- cmake (>= 2.8),
- extra-cmake-modules (>= 0.0.11),
- qtbase5-dev,
- kio-dev,
- libaccounts-qt5-dev (>= 1.10),
- libkaccounts-dev,
- libkf5i18n-dev,
- libkf5wallet-dev,
- libkf5webkit-dev,
- libkf5widgetsaddons-dev,
- libktp-dev (>= 15.04),
- libtelepathy-qt5-dev (>= 0.9.0),
+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 (>= 0.0.11~),
+ kio-dev (>= 5.0~),
+ libaccounts-qt5-dev (>= 1.10~),
+ libkaccounts-dev,
+ libkf5i18n-dev (>= 5.0~),
+ libkf5wallet-dev (>= 5.0~),
+ libkf5webkit-dev (>= 5.0~),
+ libkf5widgetsaddons-dev (>= 5.0~),
+ libktp-dev,
+ libqca-qt5-2-dev,
+ libqca2-dev,
+ libqjson-dev,
+ libqtwebkit-dev,
+ libsignon-qt5-dev (>= 8.55~),
+ libtelepathy-qt5-dev (>= 0.8.9~),
+ libtelepathy-logger-qt-dev,
- libqca-qt5-2-dev,
- libsignon-qt5-dev (>= 8.55),
+ pkg-kde-tools (>= 0.9),
+ qtbase5-dev (>= 5.4)
Standards-Version: 3.9.6
- Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-auth-handler
+ Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-auth-handler
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-auth-handler.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-auth-handler.git
diff --cc debian/watch
index d32cfed,eaccffc..60fb28a
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,3 @@@
version=3
-
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-auth-handler-([\d.]+)\.tar\.xz
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-auth-handler-([\d.]+).tar.(?:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-auth-handler-([\d.]+).tar.(?:bz2|xz)
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-auth-handler-([\d.]+)\.tar\.(?:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-auth-handler-([\d.]+)\.tar\.(?:bz2|xz)
--
ktp-auth-handler packaging
More information about the pkg-kde-commits
mailing list