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

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

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

The following commit has been merged in the master branch:
commit e60373cbd1f8e7b90b6f71d54d8f558962d4328f
Author: Jonathan Thomas <echidnaman at kubuntu.org>
Date:   Fri May 25 20:02:01 2012 -0400

    * New upstream beta release:
      - Update libactivities6.symbols for new symbols
      - Update libkactivities-bin.install for removed files
      - Add two new packages, activitymanager-uihandler-kdialog and
        activity-uihandler-declarative to contain the two frontends for the
        ActivityManager runtime. Both provide the activitymanager-uihandler
        virtual package.
      - Add an optional dependency to libkactivities-bin for either
        activity-uihandler-kdialog, or the activity-uihandler virtual package.
---
 .../activitymanager-uihandler-declarative.install  |  8 +++++++
 debian/activitymanager-uihandler-kdialog.install   |  1 +
 debian/changelog                                   | 16 +++++++++++---
 debian/control                                     | 25 +++++++++++++++++++++-
 debian/libkactivities-bin.install                  | 15 ++++++++-----
 debian/libkactivities6.symbols                     |  6 ++++++
 6 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/debian/activitymanager-uihandler-declarative.install b/debian/activitymanager-uihandler-declarative.install
new file mode 100644
index 0000000..fe98e45
--- /dev/null
+++ b/debian/activitymanager-uihandler-declarative.install
@@ -0,0 +1,8 @@
+usr/lib/kde4/activitymanager_uihandler_declarative.so
+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
+usr/share/kde4/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/NewPasswordDialog.qml
+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
+
diff --git a/debian/activitymanager-uihandler-kdialog.install b/debian/activitymanager-uihandler-kdialog.install
new file mode 100644
index 0000000..754d260
--- /dev/null
+++ b/debian/activitymanager-uihandler-kdialog.install
@@ -0,0 +1 @@
+usr/lib/kde4/activitymanager_uihandler_kdialog.so
diff --git a/debian/changelog b/debian/changelog
index 7a0e642..b4da3d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,21 @@
 kactivities (4:4.8.80-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Jonathan Thomas ]
+  * New upstream beta release:
+    - Update libactivities6.symbols for new symbols
+    - Update libkactivities-bin.install for removed files
+    - Add two new packages, activitymanager-uihandler-kdialog and
+      activity-uihandler-declarative to contain the two frontends for the
+      ActivityManager runtime. Both provide the activitymanager-uihandler
+      virtual package.
+    - Add an optional dependency to libkactivities-bin for either
+      activity-uihandler-kdialog, or the activity-uihandler virtual package.
+
+  [ Philip Muškovac ]
   * Merge with debian git, remaining changes: 
     - keep symbol file
-  * New upstream beta release
-    TODO
 
- -- Philip Muškovac <yofel at kubuntu.org>  Mon, 21 May 2012 08:24:10 +0200
+ -- Jonathan Thomas <echidnaman at kubuntu.org>  Thu, 24 May 2012 23:34:02 -0400
 
 kactivities (4:4.8.3-0ubuntu1) quantal; urgency=low
 
diff --git a/debian/control b/debian/control
index 45c22ff..1704f02 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.
 Uploaders: Eshat Cakar <info at eshat.de>
 Build-Depends: kde-sc-dev-latest (>= 4:4.8.80),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
+ libx11-dev,
+ libqt4-opengl-dev,
  kdelibs5-dev (>= 4:4.8),
  libsoprano-dev,
  shared-desktop-ontologies (>= 0.8.1)
@@ -16,7 +18,8 @@ Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivi
 
 Package: libkactivities-bin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ activitymanager-uihandler-kdialog | activitymanager-uihandler
 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),
@@ -26,6 +29,26 @@ Description: executables for the KDE Activities
  .
  This package is part of the Plasma Contour Active Platform.
 
+Package: activitymanager-uihandler-kdialog
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: activitymanager-uihandler
+Description: KDialog-based ActivityManager frontend
+ This package contains a KDialog-based frontend for the KDE Activities
+ library.
+ .
+ This package is part of the KDE Development Platform libraries module.
+
+Package: activitymanager-uihandler-declarative
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: activitymanager-uihandler
+Description: KDialog-based ActivityManager frontend
+ This package contains a QML-based frontend for the KDE Activities
+ library.
+ .
+ This package is part of the Plasma Contour Active Platform.
+
 Package: libkactivities6
 Section: libs
 Architecture: any
diff --git a/debian/libkactivities-bin.install b/debian/libkactivities-bin.install
index b0454ad..3e7dc4c 100644
--- a/debian/libkactivities-bin.install
+++ b/debian/libkactivities-bin.install
@@ -1,12 +1,17 @@
 usr/bin/kactivitymanagerd
-usr/lib/kde4/activitymanager_plugin_dummy.so
+usr/lib/kde4/activitymanager_plugin_activityranking.so
 usr/lib/kde4/activitymanager_plugin_globalshortcuts.so
-usr/lib/kde4/activitymanager_plugin_nepomuk.so
 usr/lib/kde4/activitymanager_plugin_slc.so
-usr/share/kde4/services/activitymanager-plugin-dummy.desktop
+usr/lib/kde4/activitymanager_plugin_sqlite.so
+usr/lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
+usr/lib/kde4/kio_activities.so
+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-nepomuk.desktop
 usr/share/kde4/services/activitymanager-plugin-slc.desktop
+usr/share/kde4/services/activitymanager-plugin-sqlite.desktop
+usr/share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
 usr/share/kde4/services/kactivitymanagerd.desktop
-usr/share/kde4/services/kded/activitymanager.desktop
 usr/share/kde4/servicetypes/activitymanager-plugin.desktop
+usr/share/ontology/kde/kao.trig
+usr/share/ontology/kde/kao.ontology
diff --git a/debian/libkactivities6.symbols b/debian/libkactivities6.symbols
index ffbeac3..34dea5c 100644
--- a/debian/libkactivities6.symbols
+++ b/debian/libkactivities6.symbols
@@ -10,6 +10,7 @@ libkactivities.so.6 libkactivities6 #MINVER#
  _ZN11KActivities10Controller15setActivityNameERK7QStringS3_ at Base 4.7.90
  _ZN11KActivities10Controller16staticMetaObjectE at Base 4.7.90
  _ZN11KActivities10Controller18setCurrentActivityERK7QString at Base 4.7.90
+ _ZN11KActivities10Controller20setActivityEncryptedERK7QStringb at Base 4:4.8.80
  _ZN11KActivities10ControllerC1EP7QObject at Base 4.7.90
  _ZN11KActivities10ControllerC2EP7QObject at Base 4.7.90
  _ZN11KActivities10ControllerD0Ev at Base 4.7.90
@@ -36,7 +37,9 @@ libkactivities.so.6 libkactivities6 #MINVER#
  _ZN11KActivities4Info11infoChangedEv at Base 4.7.90
  _ZN11KActivities4Info11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.7.90
  _ZN11KActivities4Info11qt_metacastEPKc at Base 4.7.90
+ _ZN11KActivities4Info12linkResourceERK4KUrl at Base 4:4.8.80
  _ZN11KActivities4Info12stateChangedENS0_5StateE at Base 4.7.90
+ _ZN11KActivities4Info14unlinkResourceERK4KUrl at Base 4:4.8.80
  _ZN11KActivities4Info16staticMetaObjectE at Base 4.7.90
  _ZN11KActivities4Info4nameERK7QString at Base 4.7.90
  _ZN11KActivities4Info5addedEv at Base 4.7.90
@@ -57,6 +60,7 @@ libkactivities.so.6 libkactivities6 #MINVER#
  _ZN11KActivities8Consumer20serviceStatusChangedENS0_13ServiceStatusE at Base 4.7.90
  _ZN11KActivities8Consumer22currentActivityChangedERK7QString at Base 4.7.90
  _ZN11KActivities8Consumer22linkResourceToActivityERK4QUrlRK7QString at Base 4.7.90
+ _ZN11KActivities8Consumer26unlinkResourceFromActivityERK4QUrlRK7QString at Base 4:4.8.80
  _ZN11KActivities8ConsumerC1EP7QObject at Base 4.7.90
  _ZN11KActivities8ConsumerC2EP7QObject at Base 4.7.90
  _ZN11KActivities8ConsumerD0Ev at Base 4.7.90
@@ -70,8 +74,10 @@ libkactivities.so.6 libkactivities6 #MINVER#
  _ZNK11KActivities16ResourceInstance5winIdEv at Base 4.7.90
  _ZNK11KActivities16ResourceInstance8mimetypeEv at Base 4.7.90
  _ZNK11KActivities4Info10metaObjectEv at Base 4.7.90
+ _ZNK11KActivities4Info11isEncryptedEv at Base 4:4.8.80
  _ZNK11KActivities4Info11resourceUriEv at Base 4.7.90
  _ZNK11KActivities4Info12availabilityEv at Base 4.7.90
+ _ZNK11KActivities8Consumer26isResourceLinkedToActivityERK4QUrlRK7QString at Base 4:4.8.80
  _ZNK11KActivities4Info2idEv at Base 4.7.90
  _ZNK11KActivities4Info3uriEv at Base 4.7.90
  _ZNK11KActivities4Info4iconEv at Base 4.7.90

-- 
kactivities packaging

More information about the pkg-kde-commits mailing list