[SCM] kactivities packaging branch, master, updated. debian/4.13.3-1-3-gf35509c
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Apr 20 14:23:43 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kactivities.git;a=commitdiff;h=f35509c
The following commit has been merged in the master branch:
commit f35509c859f60db36c31702f6d7f02f5c7cf7168
Author: Rohan Garg <rohan at garg.io>
Date: Wed Apr 20 16:23:24 2016 +0200
Pull in the new KF5 kactivitymanagerd when possible.
Refer to https://mail.kde.org/pipermail/kde-distro-packagers/2015-May/000070.html
---
debian/changelog | 7 +++++--
debian/control | 2 +-
debian/libkactivities6.symbols | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 318c044..65e726a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-kactivities (4:4.13.3-1.1) UNRELEASED; urgency=medium
+kactivities (4:4.13.3-1.2) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
* Remove myself from Uploaders.
- -- Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 25 Oct 2014 16:58:57 -0300
+ [ Rohan Garg ]
+ * Pull in the new KF5 kactivitymanagerd when possible.
+
+ -- Rohan Garg <rohan at kde.org> Wed, 20 Apr 2016 16:22:21 +0200
kactivities (4:4.13.3-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4f80038..1e094ad 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Package: libkactivities6
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libkactivities-bin (= ${binary:Version})
+Recommends: kactivitymanagerd | libkactivities-bin (= ${binary:Version})
Description: Activities library
This library provides functionality for managing activities.
.
diff --git a/debian/libkactivities6.symbols b/debian/libkactivities6.symbols
index 397a73c..cf6df8e 100644
--- a/debian/libkactivities6.symbols
+++ b/debian/libkactivities6.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 4:4.11.1 amd64
libkactivities.so.6 libkactivities6 #MINVER#
-| libkactivities6 #MINVER#, libkactivities-bin
+| libkactivities6 #MINVER#, kactivitymanagerd | libkactivities-bin
* Build-Depends-Package: libkactivities-dev
_ZN11KActivities10Controller11addActivityERK7QString at Base 4:4.8.1
_ZN11KActivities10Controller11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.8.1
--
kactivities packaging
More information about the pkg-kde-commits
mailing list