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

Pino Toscano pino at moszumanska.debian.org
Sat Jul 2 10:28:01 UTC 2016 

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

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

    drop nepomuk support
    
    Nepomuk is being phased out, so drop the support for Nepomuk models:
    - remove the libsoprano-dev, nepomuk-core-dev, and
      shared-desktop-ontologies build dependencies
    - drop the libkactivities-models1 binary, no more built
    - update install files
---
 debian/changelog                               |   5 ++
 debian/control                                 |  12 -----
 debian/libkactivities-bin.install              |   2 -
 debian/libkactivities-dev.install              |   7 ---
 debian/libkactivities-models1.abi.tar.gz.amd64 | Bin 383928 -> 0 bytes
 debian/libkactivities-models1.acc              |  17 -------
 debian/libkactivities-models1.install          |   2 -
 debian/libkactivities-models1.symbols          |  66 -------------------------
 debian/source/include-binaries                 |   1 -
 9 files changed, 5 insertions(+), 107 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0837fd..5ad9bf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ kactivities (4:4.13.3-1.1) UNRELEASED; urgency=medium
     Frameworks version of kactivitymanagerd:
     - pass -DKACTIVITIES_LIBRARY_ONLY=ON to cmake
     - update install files
+  * Nepomuk is being phased out, so drop the support for Nepomuk models:
+    - remove the libsoprano-dev, nepomuk-core-dev, and
+      shared-desktop-ontologies build dependencies
+    - drop the libkactivities-models1 binary, no more built
+    - update install 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 d40a057..50987fc 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,8 @@ Build-Depends: cmake,
                kde-sc-dev-latest (>= 4:4.12),
                kdelibs5-dev (>= 4:4.11),
                libqt4-opengl-dev,
-               libsoprano-dev,
                libx11-dev,
-               nepomuk-core-dev (>= 4:4.11),
                pkg-kde-tools (>= 0.15.4~),
-               shared-desktop-ontologies (>= 0.8.1)
 Standards-Version: 3.9.8
 Testsuite: autopkgtest
 Homepage: http://www.kde.org/
@@ -47,15 +44,6 @@ Description: Activities library
  .
  This package is part of the KDE Development Platform libraries module.
 
-Package: libkactivities-models1
-Section: libs
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Activities models library
- This library provides functionality for KDE activities models.
- .
- This package is part of the KDE Development Platform libraries module.
-
 Package: libkactivities-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/libkactivities-bin.install b/debian/libkactivities-bin.install
index 47bbbda..1841fcf 100644
--- a/debian/libkactivities-bin.install
+++ b/debian/libkactivities-bin.install
@@ -1,4 +1,2 @@
-usr/lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
-usr/lib/kde4/imports/org/kde/activities/models/qmldir
 usr/share/ontology/kde/kao.ontology
 usr/share/ontology/kde/kao.trig
diff --git a/debian/libkactivities-dev.install b/debian/libkactivities-dev.install
index 9f523e7..3658336 100644
--- a/debian/libkactivities-dev.install
+++ b/debian/libkactivities-dev.install
@@ -1,15 +1,8 @@
 usr/include/KDE/KActivities
 usr/include/kactivities
-usr/include/kactivities-models
-usr/lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake
-usr/lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake
-usr/lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-debian.cmake
-usr/lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake
 usr/lib/cmake/KActivities/KActivitiesConfig.cmake
 usr/lib/cmake/KActivities/KActivitiesConfigVersion.cmake
 usr/lib/cmake/KActivities/KActivitiesLibraryTargets-debian.cmake
 usr/lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
-usr/lib/libkactivities-models.so
 usr/lib/libkactivities.so
-usr/lib/pkgconfig/libkactivities-models.pc
 usr/lib/pkgconfig/libkactivities.pc
diff --git a/debian/libkactivities-models1.abi.tar.gz.amd64 b/debian/libkactivities-models1.abi.tar.gz.amd64
deleted file mode 100644
index 6bbb56e..0000000
Binary files a/debian/libkactivities-models1.abi.tar.gz.amd64 and /dev/null differ
diff --git a/debian/libkactivities-models1.acc b/debian/libkactivities-models1.acc
deleted file mode 100644
index f71ef18..0000000
--- a/debian/libkactivities-models1.acc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    4.11.5
-</version>
-
-<headers>
-    /usr/include/KDE/KActivities/Models
-    /usr/include/kactivities-models
-</headers>
-
-<libs>
-    /usr/lib/libkactivities-models.so
-</libs>
-
-</descriptor>
diff --git a/debian/libkactivities-models1.install b/debian/libkactivities-models1.install
deleted file mode 100644
index a4ecc3b..0000000
--- a/debian/libkactivities-models1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libkactivities-models.so.1
-usr/lib/libkactivities-models.so.1.0.0
diff --git a/debian/libkactivities-models1.symbols b/debian/libkactivities-models1.symbols
deleted file mode 100644
index 9a373ff..0000000
--- a/debian/libkactivities-models1.symbols
+++ /dev/null
@@ -1,66 +0,0 @@
-# SymbolsHelper-Confirmed: 4:4.10.0 amd64
-libkactivities-models.so.1 libkactivities-models1 #MINVER#
- _ZN11KActivities6Models13ActivityModel11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel11qt_metacastEPKc at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel16staticMetaObjectE at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private13activityAddedERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private15activityRemovedERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private17fetchActivityInfoERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private17fetchActivityListEv at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private19activityIconChangedERK7QStringS5_ at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private19activityNameChangedERK7QStringS5_ at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private20activityStateChangedERK7QStringi at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private22servicePresenceChangedEb at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private24activityInfoCallFinishedEP23QDBusPendingCallWatcher at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModel7Private26listActivitiesCallFinishedEP23QDBusPendingCallWatcher at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModelC1EP7QObject at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModelC2EP7QObject at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModelD0Ev at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModelD1Ev at Base 4:4.10.0
- _ZN11KActivities6Models13ActivityModelD2Ev at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel11qt_metacastEPKc at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel11setActivityERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel12limitChangedEi at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel14setApplicationERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel14setContentModeENS1_11ContentModeE at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel15activityChangedERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel16staticMetaObjectE at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel18applicationChangedERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private10loadLinkedEv at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private10loadRecentEv at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private10newEntriesERK5QListIN8Nepomuk25Query6ResultEE at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private12loadTopRatedEv at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private13loadFromQueryERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private14entriesRemovedERK5QListI4QUrlE at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private14infoFromResultERKN8Nepomuk25Query6ResultE at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private18setCurrentActivityERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private20resourceScoreUpdatedERK7QStringS5_S5_d at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private22servicePresenceChangedEb at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private5errorERK7QString at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel7Private6reloadEv at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModel8setLimitEi at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModelC1EP7QObject at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModelC2EP7QObject at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModelD0Ev at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModelD1Ev at Base 4:4.10.0
- _ZN11KActivities6Models13ResourceModelD2Ev at Base 4:4.10.0
- _ZNK11KActivities6Models13ActivityModel10headerDataEiN2Qt11OrientationEi at Base 4:4.10.0
- _ZNK11KActivities6Models13ActivityModel10metaObjectEv at Base 4:4.10.0
- _ZNK11KActivities6Models13ActivityModel4dataERK11QModelIndexi at Base 4:4.10.0
- _ZNK11KActivities6Models13ActivityModel8rowCountERK11QModelIndex at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel10headerDataEiN2Qt11OrientationEi at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel10metaObjectEv at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel11applicationEv at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel11contentModeEv at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel4dataERK11QModelIndexi at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel5limitEv at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel7Private16activityToShowN3Ev at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel8activityEv at Base 4:4.10.0
- _ZNK11KActivities6Models13ResourceModel8rowCountERK11QModelIndex at Base 4:4.10.0
- _ZTIN11KActivities6Models13ActivityModelE at Base 4:4.10.0
- _ZTIN11KActivities6Models13ResourceModelE at Base 4:4.10.0
- _ZTSN11KActivities6Models13ActivityModelE at Base 4:4.10.0
- _ZTSN11KActivities6Models13ResourceModelE at Base 4:4.10.0
- _ZTVN11KActivities6Models13ActivityModelE at Base 4:4.10.0
- _ZTVN11KActivities6Models13ResourceModelE at Base 4:4.10.0
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 057be75..89f28f7 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,2 +1 @@
 debian/libkactivities6.abi.tar.gz.amd64
-debian/libkactivities-models1.abi.tar.gz.amd64

-- 
kactivities packaging

More information about the pkg-kde-commits mailing list