[SCM] kactivities packaging branch, master, updated. debian/4.13.1-1-128-gfafc380

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 31 14:31:00 UTC 2014 

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

The following commit has been merged in the master branch:
commit e4e6b9c41299a7527d75493900330dd5b646ebd8
Author: Scott Kitterman <scott at kitterman.com>
Date:   Tue Nov 20 14:23:03 2012 -0500

      * Add new libkactivities-models1 library package (debian/control, .install,
        and .symbols)
      * Add nepomuk-core-dev to build-depends
      * Wildcard libkactivities6.install so that soversion changes don't cause
        build failures
      * Update libkactivities6.symbols
      * Update libkactivities-dev.install for new files for libkactivies-models
      * Add new files to libkactivities-bin.install, including Activities kcm
---
 debian/changelog                      | 14 ++++++--
 debian/control                        | 10 ++++++
 debian/libkactivities-bin.install     |  9 +++++
 debian/libkactivities-dev.install     |  7 ++++
 debian/libkactivities-models1.install |  2 ++
 debian/libkactivities-models1.symbols | 66 +++++++++++++++++++++++++++++++++++
 debian/libkactivities6.install        |  2 +-
 debian/libkactivities6.symbols        |  6 +++-
 8 files changed, 112 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c83b9cd..48941f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
 kactivities (4:4.9.80-0ubuntu1) UNRELEASED; urgency=low
 
-  * New upstream beta release
+  [ Jonathan Riddell ]
   * New upstream beta release
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Nov 2012 15:43:30 +0000
+  [ Scott Kitterman ]
+  * Add new libkactivities-models1 library package (debian/control, .install,
+    and .symbols)
+  * Add nepomuk-core-dev to build-depends
+  * Wildcard libkactivities6.install so that soversion changes don't cause
+    build failures
+  * Update libkactivities6.symbols
+  * Update libkactivities-dev.install for new files for libkactivies-models
+  * Add new files to libkactivities-bin.install, including Activities kcm
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 20 Nov 2012 13:47:27 -0500
 
 kactivities (4:4.9.3-0ubuntu1) raring; urgency=low
 
diff --git a/debian/control b/debian/control
index 9cf7bd4..626d5bd 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  libqt4-opengl-dev,
  kdelibs5-dev (>= 4:4.9.80),
  libsoprano-dev,
+ nepomuk-core-dev,
  shared-desktop-ontologies (>= 0.8.1)
 Standards-Version: 3.9.3
 Homepage: http://www.kde.org/
@@ -37,6 +38,15 @@ Description: Activities library
  .
  This package is part of the KDE Development Platform libraries module.
 
+Package: libkactivities-models1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libkactivities-bin (= ${binary:Version})
+Description: Activities models library
+ This library provides functionality for KDE activity 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 ed2196b..9b420ce 100644
--- a/debian/libkactivities-bin.install
+++ b/debian/libkactivities-bin.install
@@ -4,8 +4,14 @@ usr/lib/kde4/activitymanager_plugin_slc.so
 usr/lib/kde4/activitymanager_plugin_sqlite.so
 usr/lib/kde4/activitymanager_uihandler_declarative.so
 usr/lib/kde4/activitymanager_uihandler_kdialog.so
+usr/lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
+usr/lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
+usr/lib/kde4/imports/org/kde/activities/models/qmldir
 usr/lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
+usr/lib/kde4/kcm_activities.so
 usr/lib/kde4/kio_activities.so
+usr/lib/kde4/activitymanager_plugin_activityranking.so
+usr/share/kde4/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
 usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop
 usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml
 usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml
@@ -13,11 +19,14 @@ usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/u
 usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/ChoiceDialog.qml
 usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/MessageDialog.qml
 usr/share/kde4/services/activities.protocol
+usr/share/kde4/services/activitymanager-plugin-activityranking.desktop
 usr/share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
 usr/share/kde4/services/activitymanager-plugin-slc.desktop
 usr/share/kde4/services/activitymanager-plugin-sqlite.desktop
+usr/share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
 usr/share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
 usr/share/kde4/services/kactivitymanagerd.desktop
+usr/share/kde4/services/kcm_activities.desktop
 usr/share/kde4/servicetypes/activitymanager-plugin.desktop
 usr/share/ontology/kde/kao.trig
 usr/share/ontology/kde/kao.ontology
diff --git a/debian/libkactivities-dev.install b/debian/libkactivities-dev.install
index 012cc85..615dcf1 100644
--- a/debian/libkactivities-dev.install
+++ b/debian/libkactivities-dev.install
@@ -1,8 +1,15 @@
 usr/include/kactivities
 usr/include/KDE/KActivities
+usr/include/kactivities-models
 usr/lib/cmake/KActivities/KActivitiesConfig.cmake
 usr/lib/cmake/KActivities/KActivitiesConfigVersion.cmake
 usr/lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
 usr/lib/cmake/KActivities/KActivitiesLibraryTargets-debian.cmake
+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/libkactivities.so
+usr/lib/libkactivities-models.so
 usr/lib/pkgconfig/libkactivities.pc
+usr/lib/pkgconfig/libkactivities-models.pc
diff --git a/debian/libkactivities-models1.install b/debian/libkactivities-models1.install
new file mode 100644
index 0000000..ca00fa5
--- /dev/null
+++ b/debian/libkactivities-models1.install
@@ -0,0 +1,2 @@
+usr/lib/libkactivities-models.so.1
+usr/lib/libkactivities-models.so.1.*
diff --git a/debian/libkactivities-models1.symbols b/debian/libkactivities-models1.symbols
new file mode 100644
index 0000000..d3f6309
--- /dev/null
+++ b/debian/libkactivities-models1.symbols
@@ -0,0 +1,66 @@
+# SymbolsHelper-Confirmed: 4:4.9.80 i386
+libkactivities-models.so.1 libkactivities-models1 #MINVER#
+ _ZN11KActivities6Models13ActivityModel11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel11qt_metacastEPKc at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel16staticMetaObjectE at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private13activityAddedERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private15activityRemovedERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private17fetchActivityInfoERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private17fetchActivityListEv at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private19activityIconChangedERK7QStringS5_ at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private19activityNameChangedERK7QStringS5_ at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private20activityStateChangedERK7QStringi at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private22servicePresenceChangedEb at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private24activityInfoCallFinishedEP23QDBusPendingCallWatcher at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModel7Private26listActivitiesCallFinishedEP23QDBusPendingCallWatcher at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModelC1EP7QObject at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModelC2EP7QObject at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModelD0Ev at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModelD1Ev at Base 4:4.9.80
+ _ZN11KActivities6Models13ActivityModelD2Ev at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel11qt_metacastEPKc at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel11setActivityERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel12limitChangedEi at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel14setApplicationERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel14setContentModeENS1_11ContentModeE at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel15activityChangedERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel16staticMetaObjectE at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel18applicationChangedERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private10loadLinkedEv at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private10loadRecentEv at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private10newEntriesERK5QListIN8Nepomuk25Query6ResultEE at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private12loadTopRatedEv at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private13loadFromQueryERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private14entriesRemovedERK5QListI4QUrlE at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private14infoFromResultERKN8Nepomuk25Query6ResultE at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private18setCurrentActivityERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private20resourceScoreUpdatedERK7QStringS5_S5_d at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private22servicePresenceChangedEb at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private5errorERK7QString at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel7Private6reloadEv at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModel8setLimitEi at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModelC1EP7QObject at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModelC2EP7QObject at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModelD0Ev at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModelD1Ev at Base 4:4.9.80
+ _ZN11KActivities6Models13ResourceModelD2Ev at Base 4:4.9.80
+ _ZNK11KActivities6Models13ActivityModel10headerDataEiN2Qt11OrientationEi at Base 4:4.9.80
+ _ZNK11KActivities6Models13ActivityModel10metaObjectEv at Base 4:4.9.80
+ _ZNK11KActivities6Models13ActivityModel4dataERK11QModelIndexi at Base 4:4.9.80
+ _ZNK11KActivities6Models13ActivityModel8rowCountERK11QModelIndex at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel10headerDataEiN2Qt11OrientationEi at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel10metaObjectEv at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel11applicationEv at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel11contentModeEv at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel4dataERK11QModelIndexi at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel5limitEv at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel7Private16activityToShowN3Ev at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel8activityEv at Base 4:4.9.80
+ _ZNK11KActivities6Models13ResourceModel8rowCountERK11QModelIndex at Base 4:4.9.80
+ _ZTIN11KActivities6Models13ActivityModelE at Base 4:4.9.80
+ _ZTIN11KActivities6Models13ResourceModelE at Base 4:4.9.80
+ _ZTSN11KActivities6Models13ActivityModelE at Base 4:4.9.80
+ _ZTSN11KActivities6Models13ResourceModelE at Base 4:4.9.80
+ _ZTVN11KActivities6Models13ActivityModelE at Base 4:4.9.80
+ _ZTVN11KActivities6Models13ResourceModelE at Base 4:4.9.80
diff --git a/debian/libkactivities6.install b/debian/libkactivities6.install
index 1ef36f5..6cf43b4 100644
--- a/debian/libkactivities6.install
+++ b/debian/libkactivities6.install
@@ -1,2 +1,2 @@
 usr/lib/libkactivities.so.6
-usr/lib/libkactivities.so.6.0.0
+usr/lib/libkactivities.so.6.*
diff --git a/debian/libkactivities6.symbols b/debian/libkactivities6.symbols
index 5620021..cca9252 100644
--- a/debian/libkactivities6.symbols
+++ b/debian/libkactivities6.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4.7.90 amd64
+# SymbolsHelper-Confirmed: 4:4.9.80 i386
 libkactivities.so.6 libkactivities6 #MINVER#
  _ZN11KActivities10Controller11addActivityERK7QString at Base 4.7.90
  _ZN11KActivities10Controller11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.7.90
@@ -29,12 +29,16 @@ libkactivities.so.6 libkactivities6 #MINVER#
  _ZN11KActivities16ResourceInstance8setTitleERK7QString at Base 4.7.90
  _ZN11KActivities16ResourceInstanceC1Em4QUrlRK7QStringS4_NS0_12AccessReasonES4_P7QObject at Base 4.7.90
  _ZN11KActivities16ResourceInstanceC1EmNS0_12AccessReasonERK7QStringP7QObject at Base 4.7.90
+ _ZN11KActivities16ResourceInstanceC1EmP7QObject at Base 4:4.9.80
  _ZN11KActivities16ResourceInstanceC2Em4QUrlRK7QStringS4_NS0_12AccessReasonES4_P7QObject at Base 4.7.90
  _ZN11KActivities16ResourceInstanceC2EmNS0_12AccessReasonERK7QStringP7QObject at Base 4.7.90
+ _ZN11KActivities16ResourceInstanceC2EmP7QObject at Base 4:4.9.80
  _ZN11KActivities16ResourceInstanceD0Ev at Base 4.7.90
  _ZN11KActivities16ResourceInstanceD1Ev at Base 4.7.90
  _ZN11KActivities16ResourceInstanceD2Ev at Base 4.7.90
+ _ZN11KActivities4Info11iconChangedERK7QString at Base 4:4.9.80
  _ZN11KActivities4Info11infoChangedEv at Base 4.7.90
+ _ZN11KActivities4Info11nameChangedERK7QString at Base 4:4.9.80
  _ZN11KActivities4Info11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.7.90
  _ZN11KActivities4Info11qt_metacastEPKc at Base 4.7.90
  _ZN11KActivities4Info12linkResourceERK4KUrl at Base 4:4.8.80

-- 
kactivities packaging

More information about the pkg-kde-commits mailing list