[SCM] telepathy-logger-qt packaging branch, kubuntu_wily_archive, updated. debian/0.4.0-1-66-gca7e9b7
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Wed Jun 24 12:35:38 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-logger-qt.git;a=commitdiff;h=ca7e9b7
The following commit has been merged in the kubuntu_wily_archive branch:
commit ca7e9b7871e2951e7921b7252dc7ead8971ccf42
Merge: e79011c8d5dda4e7679bc7b793da2e41941f50a3 2a2da4b958ae23aa7ac331b4d7a93a89d3a4f0e2
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Jun 24 14:35:24 2015 +0200
merge master
CMakeLists.txt | 274 +++-------
TelepathyLoggerQt/CMakeLists.txt | 171 +++++++
.../TelepathyLoggerQt-uninstalled.pc.in | 0
TelepathyLoggerQt/TelepathyLoggerQt.pc.in | 11 +
TelepathyLoggerQt/TelepathyLoggerQtConfig.cmake.in | 9 +
.../call-event.cpp | 9 +-
.../call-event.h | 20 +-
.../entity.cpp | 11 +-
{TelepathyLoggerQt4 => TelepathyLoggerQt}/entity.h | 23 +-
.../event.cpp | 17 +-
{TelepathyLoggerQt4 => TelepathyLoggerQt}/event.h | 22 +-
TelepathyLoggerQt/global.h | 70 +++
{TelepathyLoggerQt4 => TelepathyLoggerQt}/init.cpp | 11 +-
{TelepathyLoggerQt4 => TelepathyLoggerQt}/init.h | 16 +-
.../log-manager.cpp | 72 ++-
.../log-manager.h | 64 ++-
.../log-walker.cpp | 13 +-
.../log-walker.h | 22 +-
.../logger.xml | 0
.../init.h => TelepathyLoggerQt/object.cpp | 30 +-
.../init.h => TelepathyLoggerQt/object.h | 33 +-
.../pending-clear.cpp | 8 +-
.../pending-clear.h | 17 +-
.../pending-dates.cpp | 22 +-
.../pending-dates.h | 18 +-
.../pending-entities.cpp | 22 +-
.../pending-entities.h | 18 +-
.../pending-events.cpp | 48 +-
.../pending-events.h | 18 +-
.../pending-log-walker-operation.cpp | 17 +-
.../pending-log-walker-operation.h | 14 +-
.../pending-operation.cpp | 7 +-
.../pending-operation.h | 17 +-
.../pending-search.cpp | 26 +-
.../pending-search.h | 18 +-
.../search-hit.cpp | 9 +-
.../search-hit.h | 18 +-
.../stable-interfaces.xml | 0
.../text-event.cpp | 6 +-
.../text-event.h | 21 +-
{TelepathyLoggerQt4 => TelepathyLoggerQt}/types.h | 37 +-
.../utils.cpp | 28 +-
{TelepathyLoggerQt4 => TelepathyLoggerQt}/utils.h | 27 +-
TelepathyLoggerQt4/CMakeLists.txt | 267 ----------
TelepathyLoggerQt4/CallEvent | 12 -
TelepathyLoggerQt4/Entity | 12 -
TelepathyLoggerQt4/Event | 12 -
TelepathyLoggerQt4/Global | 12 -
TelepathyLoggerQt4/Init | 12 -
TelepathyLoggerQt4/LogManager | 12 -
TelepathyLoggerQt4/LogWalker | 12 -
TelepathyLoggerQt4/PendingDates | 12 -
TelepathyLoggerQt4/PendingEntities | 12 -
TelepathyLoggerQt4/PendingEvents | 12 -
TelepathyLoggerQt4/PendingOperation | 12 -
TelepathyLoggerQt4/PendingSearch | 12 -
TelepathyLoggerQt4/SearchHit | 12 -
TelepathyLoggerQt4/TelepathyLoggerQt4.pc.in | 11 -
.../TelepathyLoggerQt4Config.cmake.in | 34 --
TelepathyLoggerQt4/TextEvent | 12 -
TelepathyLoggerQt4/Types | 12 -
TelepathyLoggerQt4/global.h | 75 ---
cmake/modules/BasicFindPackageVersion.cmake.in | 30 --
cmake/modules/CompilerWarnings.cmake | 6 +-
cmake/modules/Doxygen.cmake | 13 +
cmake/modules/FindDBus.cmake | 73 +--
cmake/modules/FindDBusGLib.cmake | 38 +-
cmake/modules/FindGStreamer.cmake | 80 ---
cmake/modules/FindQt.cmake | 85 ----
cmake/modules/FindQt5.cmake | 164 ------
cmake/modules/FindQtGLib.cmake | 46 --
cmake/modules/FindTelepathyFarsight.cmake | 49 --
cmake/modules/FindTelepathyGlib.cmake | 6 +-
cmake/modules/FindTelepathyLogger.cmake | 10 +
cmake/modules/MacroLogFeature.cmake | 146 ------
.../modules/MacroWriteBasicCMakeVersionFile.cmake | 21 -
cmake/modules/TelepathyDefaults.cmake | 146 ------
cmake/modules/TelepathyDist.cmake | 39 --
cmake/modules/TpLoggerQtMacros.cmake | 39 ++
cmake/modules/TpQtMacros.cmake | 6 +-
codegen/CMakeLists.txt | 29 --
codegen/analyzer.l | 143 ------
codegen/generator.cpp | 279 ----------
codegen/generator.h | 78 ---
codegen/parser.y | 202 --------
codegen/yystype.h | 29 --
debian/changelog | 11 +-
debian/control | 26 +-
debian/copyright | 128 +++--
debian/libtelepathy-logger-qt-dev.acc.in | 20 +
debian/libtelepathy-logger-qt-dev.install | 5 +-
debian/libtelepathy-logger-qt5.symbols | 563 +++++++++++----------
debian/rules | 7 +-
debian/tests/acc | 11 +
debian/tests/control | 6 +
debian/tests/testsuite | 3 +
debian/watch | 2 +-
doxygen.cfg.in | 4 +-
tools/tpl-tool.cpp | 50 +-
tools/tpl-tool.h | 6 +-
100 files changed, 1344 insertions(+), 3136 deletions(-)
diff --cc debian/changelog
index 83e793c,5612262..7c11392
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,13 +1,28 @@@
- telepathy-logger-qt (15.04.0-0ubuntu1~ubuntu15.04~ppa2) wily; urgency=medium
++telepathy-logger-qt (15.04.0-0ubuntu1) wily; urgency=medium
+
+ * Port to wily.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 15 May 2015 22:01:22 -0700
+
+telepathy-logger-qt (15.04.0-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
+
+ * New upstream Qt 5 release
+ * Packages dropped their qt version suffix and gained a soversion 5
+ * Watch file updated to unstable path
+ * PPA build
+
+ -- Harald Sitter <sitter at kde.org> Mon, 09 Mar 2015 10:46:14 +0100
+
- telepathy-logger-qt (0.8.0-4) UNRELEASED; urgency=medium
+ telepathy-logger-qt (15.04.0-1~) UNRELEASED; urgency=medium
+ [ Diane Trout ]
* Update watch file
- -- Diane Trout <diane at ghic.org> Thu, 18 Sep 2014 09:27:12 -0700
+ [ Maximiliano Curia ]
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * New upstream release (15.04.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 28 Apr 2015 15:37:27 +0200
telepathy-logger-qt (0.8.0-3) unstable; urgency=medium
diff --cc debian/control
index e7f82e5,076b663..8a96660
--- a/debian/control
+++ b/debian/control
@@@ -38,7 -45,7 +45,8 @@@ Section: libdeve
Architecture: any
Depends: libqtgstreamer-dev,
libtelepathy-logger-qt5 (= ${binary:Version}),
+ libtelepathy-qt5-dev,
+ libtelepathy-qt5-dev (>= 0.9.1~),
${misc:Depends}
Description: Qt bindings for the telepathy-logger library - development files
This library provides Qt-style C++ bindings for the telepathy-logger library.
diff --cc debian/rules
index 6e0056b,f0794d3..63a9013
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,14 +1,13 @@@
#!/usr/bin/make -f
-CMAKE_FLAGS = -DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR=1
-include /usr/share/dpkg/architecture.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
- override_dh_strip:
- $(overridden_command) --dbg-package=libtelepathy-logger-qt-dbg
+ %:
+ dh $@ --with kde --buildsystem=kde --parallel --list-missing --dbg-package=libtelepathy-logger-qt-dbg
+
+ override_dh_auto_configure:
+ dh_auto_configure --buildsystem=kde -- -DBUILD_SHARED_LIBS=1 -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" $(CMAKE_FLAGS)
override_dh_clean:
- dh_clean
+ $(overridden_command)
rm -f tools/*.pyc
--
telepathy-logger-qt packaging
More information about the pkg-kde-commits
mailing list