[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/0.7.0-1-76-ga900e5f
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:55:01 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=a900e5f
The following commit has been merged in the master branch:
commit a900e5f509a7f77b34b7c8d15fcf4a1d3de9b89b
Merge: 178422698e3683788450b9319db57e2fb3603d51 deec78f5572f45dc69e9c3488a16e14782a7ce19
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 26 16:36:49 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 8 +
.reviewboardrc | 2 +
AUTHORS | 11 +
CMakeLists.txt | 26 +
COPYING | 855 +++++++++++++++++++++
Messages.sh | 4 +
NEWS | 137 ++++
README | 21 +
TODO | 14 +
debian/changelog | 51 +-
debian/control | 11 +-
debian/copyright | 86 +--
debian/kde-telepathy-filetransfer-handler.install | 3 +-
debian/rules | 9 +-
debian/watch | 4 +-
src/CMakeLists.txt | 34 +
src/KTp.FileTransferHandler.client | 6 +
src/filetransfer-handler.cpp | 141 ++++
src/filetransfer-handler.h | 53 ++
src/handle-incoming-file-transfer-channel-job.cpp | 529 +++++++++++++
src/handle-incoming-file-transfer-channel-job.h | 63 ++
src/handle-outgoing-file-transfer-channel-job.cpp | 314 ++++++++
src/handle-outgoing-file-transfer-channel-job.h | 59 ++
src/ktp-fth-debug.cpp | 21 +
src/ktp-fth-debug.h | 26 +
src/main.cpp | 103 +++
...pathy.Client.KTp.FileTransferHandler.service.in | 3 +
src/telepathy-base-job.cpp | 140 ++++
src/telepathy-base-job.h | 105 +++
src/telepathy-base-job_p.h | 60 ++
src/version.h.in | 1 +
31 files changed, 2802 insertions(+), 98 deletions(-)
diff --cc CMakeLists.txt
index 0000000,152e758..7f6c2eb
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,26 +1,26 @@@
+ project (ktp-filetransfer-handler)
+
+ 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_FILETRANSFER_HANDLER_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+
+ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH})
+
+ find_package (KF5 REQUIRED COMPONENTS CoreAddons I18n KIO Config)
+ find_package (Qt5 REQUIRED COMPONENTS Core DBus Widgets)
+ find_package (KTp REQUIRED)
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ include(ECMSetupVersion)
+ include(FeatureSummary)
+
+ add_subdirectory(src)
+
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --cc debian/changelog
index 3088293,6748b6a..c9a55c8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,40 +1,50 @@@
+ktp-filetransfer-handler (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 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.08.3).
+ * New upstream release (15.12.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:14:04 +0100
+
+ ktp-filetransfer-handler (15.08.3-1) unstable; urgency=medium
+
++ [ Diane Trout ]
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Sat, 05 Dec 2015 17:43:17 -0800
+
+ ktp-filetransfer-handler (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 build depends for move to kf5 and the
+ rename of libktpcommoninternalsprivate-dev to libktp-dev
+ * Update copyright file.
+ - Remove po/* block
+ - Add LGPL-2 license that was used.
+ * Use dhmk from pkg-kde-tools to build ktp.
+ - Change maintainer to debian-qt-kde
+ - Update debian/rules
+ * Update path for ktp-filetransfer-handler
+ * Add KDE's unstable download url to watch file
+ * Fix typo in --dbg-package name for dh_strip
+ * Fix typo in copyright file short license name.
+
+ -- Diane Trout <diane at ghic.org> Sat, 07 Nov 2015 10:57:35 -0800
+
+ ktp-filetransfer-handler (0.9.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update libktpcommoninternalsprivate-dev build-dep to 0.9.0
+ * Fix filename typo in copyright file.
+ * 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:03:26 -0700
+
ktp-filetransfer-handler (0.8.1-1) unstable; urgency=medium
* New upstream release.
@@@ -44,7 -61,7 +71,7 @@@ ktp-filetransfer-handler (0.6.3-1) unst
* 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 2f726a3,5ce3afd..4363683
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,29 +1,31 @@@
Source: ktp-filetransfer-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),
- libtelepathy-qt5-dev (>= 0.9.3),
- libtelepathy-logger-qt-dev,
- cmake (>= 2.8),
- extra-cmake-modules (>= 1.3.0),
- kio-dev,
- libktp-dev (>= 0.9.0),
- libkf5config-dev,
- libkf5coreaddons-dev,
- libkf5i18n-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,
+ libkf5coreaddons-dev,
+ libkf5i18n-dev,
++ libkf5wallet-dev,
+ libktp-dev,
++ libtelepathy-logger-qt-dev,
++ 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-filetransfer-handler
+ Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-filetransfer-handler
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-filetransfer-handler.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-filetransfer-handler.git
Package: kde-telepathy-filetransfer-handler
Architecture: any
- Depends: kde-telepathy-data (>= ${source:Upstream-Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, kde-telepathy-data (>= 0.8.1)
++Depends: kde-telepathy-data (>= 0.8.1), ${misc:Depends}, ${shlibs:Depends}
Recommends: kde-telepathy
Description: KDE Telepathy file transfer handler
This package provides a helper application that handles telepathy
diff --cc debian/watch
index 71cf2c5,728a13e..4500c0a
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,3 @@@
version=3
-
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-filetransfer-handler-([\d.]+)\.tar\.xz
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-filetransfer-handler-([\d.]+).tar.(?:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-filetransfer-handler-([\d.]+).tar.(?:bz2|xz)
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-filetransfer-handler-([\d.]+)\.tar\.(?:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-filetransfer-handler-([\d.]+)\.tar\.(?:bz2|xz)
--
ktp-filetransfer-handler packaging
More information about the pkg-kde-commits
mailing list