[SCM] kactivities packaging branch, master, updated. debian/4.13.3-1-15-gc2e6349

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kactivities.git;a=commitdiff;h=44fe97a

The following commit has been merged in the master branch:
commit 44fe97a42d2b9b5b57c0cd366e89faeb3776ff55
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 2 11:58:37 2016 +0200

    drop libkactivities-bin
---
 debian/changelog                  |  5 ++---
 debian/control                    | 17 -----------------
 debian/libkactivities-bin.install |  2 --
 debian/libkactivities6.symbols    |  1 -
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ad9bf6..f98dad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ kactivities (4:4.13.3-1.1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Remove myself from Uploaders.
 
-  [ Rohan Garg ]
-  * Pull in the new KF5 kactivitymanagerd when possible.
-
   [ Pino Toscano ]
   * Remove Ubuntu cruft from control.
   * Update Vcs-* fields.
@@ -24,6 +21,8 @@ kactivities (4:4.13.3-1.1) UNRELEASED; urgency=medium
       shared-desktop-ontologies build dependencies
     - drop the libkactivities-models1 binary, no more built
     - update install files
+  * Entirely drop libkactivities-bin, since all it now left are the
+    Nepomuk-related kao.ontology and kao.trig files.
 
  -- Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 20 Apr 2016 16:22:21 +0200
 
diff --git a/debian/control b/debian/control
index 50987fc..246253b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,27 +18,10 @@ Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kde-sc/kactivities.git/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-sc/kactivities.git
 
-Package: libkactivities-bin
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kde-runtime (<< 4:4.8),
-        kde-runtime-data (<< 4:4.8),
-        kdebase-runtime (<< 4:4.8),
-        kdebase-runtime-data (<< 4:4.8)
-Replaces: kde-runtime (<< 4:4.8),
-          kde-runtime-data (<< 4:4.8),
-          kdebase-runtime (<< 4:4.8),
-          kdebase-runtime-data (<< 4:4.8)
-Description: executables for the KDE Activities
- This package contains binary files shipped with the KDE Activities library.
- .
- This package is part of the Plasma Contour Active Platform.
-
 Package: libkactivities6
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: kactivitymanagerd | libkactivities-bin (= ${binary:Version})
 Description: Activities library
  This library provides functionality for managing activities.
  .
diff --git a/debian/libkactivities-bin.install b/debian/libkactivities-bin.install
deleted file mode 100644
index 1841fcf..0000000
--- a/debian/libkactivities-bin.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/ontology/kde/kao.ontology
-usr/share/ontology/kde/kao.trig
diff --git a/debian/libkactivities6.symbols b/debian/libkactivities6.symbols
index cf6df8e..9574f21 100644
--- a/debian/libkactivities6.symbols
+++ b/debian/libkactivities6.symbols
@@ -1,6 +1,5 @@
 # SymbolsHelper-Confirmed: 4:4.11.1 amd64
 libkactivities.so.6 libkactivities6 #MINVER#
-| 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