[SCM] ktp-send-file packaging branch, master, updated. debian/0.7.0-1-72-g738b777
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:50:06 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=738b777
The following commit has been merged in the master branch:
commit 738b7771c3aea355a807770ed113405348fdcc04
Merge: d3a9e4b9cb52515ba008a9b99aff02c0ae99ce70 56150c138200d87bce44724fd78c90eba35af487
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 26 16:02:38 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 8 +
.reviewboardrc | 2 +
CMakeLists.txt | 47 +++
COPYING | 502 +++++++++++++++++++++++++++++++++
Messages.sh | 4 +
debian/changelog | 46 ++-
debian/control | 11 +-
debian/copyright | 59 ----
debian/kde-telepathy-send-file.install | 3 +-
debian/rules | 9 +-
debian/watch | 4 +-
ktp-send-file.desktop | 57 ++++
main.cpp | 73 +++++
mainwindow.cpp | 203 +++++++++++++
mainwindow.h | 67 +++++
mainwindow.ui | 153 ++++++++++
version.h.in | 1 +
17 files changed, 1167 insertions(+), 82 deletions(-)
diff --cc CMakeLists.txt
index 0000000,258cb55..b59070a
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,47 +1,47 @@@
+ project(ktp-send-file)
+
+ 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_SEND_FILE_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)
+ find_package(KF5 5.0 REQUIRED COMPONENTS KCMUtils KIO IconThemes I18n)
+ find_package(KTp REQUIRED)
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ include(FeatureSummary)
+
+ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+ qt5_wrap_ui(KTP_SEND_FILE_SRCS mainwindow.ui)
+
+ # Create the plasmoid
+ add_executable(ktp-send-file mainwindow.cpp main.cpp ${KTP_SEND_FILE_SRCS})
+
+ # Link against the needed libraries
+ target_link_libraries(ktp-send-file
+ KTp::CommonInternals
+ KTp::Widgets
+ KTp::Models
+ Qt5::Widgets
+ KF5::CoreAddons
+ KF5::I18n
+ KF5::KIOWidgets
+ KF5::IconThemes
+ )
+
+ install(TARGETS ktp-send-file ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES ktp-send-file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus)
+
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --cc debian/changelog
index b5688c9,a4272f7..c7a49a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,35 +1,45 @@@
+ktp-send-file (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.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:08:35 +0100
+
+ ktp-send-file (15.08.3-1) unstable; urgency=medium
+
++ [ Diane Trout ]
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 23:24:50 -0800
+
+ ktp-send-file (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 rename of
+ libktpcommoninternalsprivate-dev to libktp-dev
+ * Update copyright file, remove po/* block
+ * Use dhmk from pkg-kde-tools to build ktp.
+ - Change maintainer to debian-qt-kde
+ - Update debian/rules
+ - Update paths for new KF5 locations.
+ * Add KDE's unstable download url to watch file
+
+ -- Diane Trout <diane at ghic.org> Sat, 07 Nov 2015 10:59:40 -0800
+
+ ktp-send-file (0.9.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update libktpcommoninternalsprivate-dev build-dep to 0.9.0
+ * 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 20:11:19 -0700
+
ktp-send-file (0.8.1-1) unstable; urgency=medium
* New upstream release.
@@@ -47,7 -59,7 +69,7 @@@ ktp-send-file (0.6.3-1) unstable; urgen
* 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 99032fb,fd8390b..c4ffd33
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,29 +1,31 @@@
Source: ktp-send-file
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 (>= 15.04),
- libkf5kcmutils-dev,
- libkf5iconthemes-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 (>= 5.0~),
+ libkf5i18n-dev (>= 5.0~),
+ libkf5iconthemes-dev (>= 5.0~),
+ libkf5kcmutils-dev (>= 5.0~),
++ 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-send-file
+ Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-send-file
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-send-file.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-send-file.git
Package: kde-telepathy-send-file
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
Enhances: dolphin, konqueror
Description: KDE Telepathy dolphin/konqueror integration plugin
diff --cc debian/watch
index e34e4e5,ac938f7..2e08aa6
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,3 @@@
version=3
-
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-send-file-([\d.]+)\.tar\.xz
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-send-file-([\d.]+).tar.(?x:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-send-file-([\d.]+).tar.(?x:bz2|xz)
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-send-file-([\d.]+)\.tar\.(?x:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-send-file-([\d.]+)\.tar\.(?x:bz2|xz)
--
ktp-send-file packaging
More information about the pkg-kde-commits
mailing list