[SCM] ktp-contact-runner packaging branch, master, updated. debian/0.7.0-1-78-g883f8d1
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:51:32 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=883f8d1
The following commit has been merged in the master branch:
commit 883f8d150d1808fc4dc0995e4bec76a8e52bae5d
Merge: eda802d090d3439c3e13055568e72fd448ea7b25 27f4cd44d981b4a450955d8380992431dfb115b4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 26 15:09:51 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 3 +
.reviewboardrc | 2 +
CMakeLists.txt | 55 +++
COPYING | 502 ++++++++++++++++++++++++
Messages.sh | 4 +
debian/changelog | 36 ++
debian/control | 3 +
debian/plasma-runner-telepathy-contact.install | 3 +-
debian/rules | 3 +
debian/watch | 3 +-
plasma-runner-ktp-contact.desktop.cmake | 98 +++++
src/contactrunner.cpp | 514 +++++++++++++++++++++++++
src/contactrunner.h | 84 ++++
13 files changed, 1308 insertions(+), 2 deletions(-)
diff --cc CMakeLists.txt
index 0000000,c25f216..300a795
mode 000000,100644..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,0 -1,55 +1,55 @@@
+ project(KTPContactRunner)
+
+ 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_RUNNER_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+ set(IS_KTP_INTERNAL_MODULE TRUE)
+
+ find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+ set (CMAKE_MODULE_PATH
+ ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}
+ )
+ cmake_policy(SET CMP0002 OLD)
+
+ # Find the required Libaries
+ find_package (Qt5 REQUIRED CONFIG COMPONENTS Widgets Core DBus Network)
+ find_package (KF5 REQUIRED COMPONENTS I18n Service Runner)
+ find_package (KTp REQUIRED)
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ include(FeatureSummary)
+
+ include_directories(
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ )
+
+ # We add our source code here
+ set(runner_SRCS src/contactrunner.cpp)
+
+ add_library(krunner_ktp_contacts MODULE ${runner_SRCS})
+ target_link_libraries(krunner_ktp_contacts
+ Qt5::Widgets
+ KF5::I18n
+ KF5::Service
+ KF5::Runner
+ KTp::Models
+ KTp::CommonInternals)
+
+ install(TARGETS krunner_ktp_contacts
+ DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plasma-runner-ktp-contact.desktop.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/plasma-runner-ktp-contact.desktop
+ @ONLY)
+
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-runner-ktp-contact.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+ )
+
diff --cc debian/changelog
index 335afd3,32b56bc..f78e15f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,39 +1,68 @@@
+ktp-contact-runner (15.12.0-1~) UNRELEASED; urgency=medium
+
+ [ Harald Sitter ]
+ * KDE Frameworks 5 port
+
+ [ Diane Trout ]
+ * New upstream release
+ * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
+ * Change kde-telepathy-data dependency to source:Upstream-Version
+ * Update copyright file
+
+ [ Maximiliano Curia ]
+ * 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:10:22 +0100
+
+ ktp-contact-runner (15.08.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Diane Trout <diane at ghic.org> Wed, 02 Dec 2015 21:51:43 -0800
+
+ ktp-contact-runner (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 copyright file as the translations are shipped elsewhere,
+ and the cmake files were removed.
+ * Update build-depends to include extra-cmake-modules, qtbase5-dev,
+ libtelepathy-qt5-dev libtelepathy-logger-qt-dev, the renamed
+ libktp-dev and a few other kf5-dev packages.
+ * Update install paths for plasma-runner-telepathy-contact
+ * Use --fail-missing to make it easier to find not installed files.
+ * 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:46:24 -0800
+
+ ktp-contact-runner (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 19:54:21 -0700
+
+ktp-contact-runner (0.9.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Merge with Debian git, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 28 Oct 2014 13:14:01 +0100
+
ktp-contact-runner (0.8.1-1) unstable; urgency=medium
* New upstream release
diff --cc debian/control
index 455d0f7,3b2b36a..805a2a7
--- a/debian/control
+++ b/debian/control
@@@ -2,24 -2,23 +2,27 @@@ Source: ktp-contact-runne
Section: kde
Priority: optional
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),
- cmake,
- extra-cmake-modules,
- pkg-kde-tools,
- qtbase5-dev,
- libtelepathy-qt5-dev (>= 0.9.1),
- libtelepathy-logger-qt-dev,
- libktp-dev (>= 15.04),
- libkf5i18n-dev,
- libkf5service-dev,
- libkf5runner-dev,
- libkf5wallet-dev,
+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.0.0~),
+ gettext,
+ libkf5i18n-dev,
+ libkf5runner-dev,
+ libkf5service-dev,
++ libkf5wallet-dev,
+ libktp-dev,
++ libtelepathy-qt5-dev (>= 0.9.1),
++ libtelepathy-logger-qt-dev,
+ pkg-kde-tools (>> 0.15.15),
+ qtbase5-dev (>= 5.4)
Standards-Version: 3.9.6
Homepage: https://projects.kde.org/projects/kde/kdenetwork/ktp-contact-runner
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-contact-runner.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-contact-runner.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/ktp-contact-runner.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/ktp-contact-runner.git
Package: plasma-runner-telepathy-contact
Architecture: any
diff --cc debian/watch
index 3294e83,eec6c46..36d90e7
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,3 +1,3 @@@
version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-runner-([\d.]+)\.tar\.xz
-http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-runner-([\d.]+).tar.(?:bz2|xz)
-http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-contact-runner-([\d.]+).tar.(?:bz2|xz)
++http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-runner-([\d.]+)\.tar\.(?:bz2|xz)
++http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-contact-runner-([\d.]+)\.tar\.(?:bz2|xz)
--
ktp-contact-runner packaging
More information about the pkg-kde-commits
mailing list