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

[Maximiliano Curia]

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

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

    After consulting with Debian, we'll just stuff both frontends in to libkdeclarative-bin since the savings aren't worth the complexity of the split.
---
 .../activitymanager-uihandler-declarative.install  |  8 --------
 debian/activitymanager-uihandler-kdialog.install   |  1 -
 debian/changelog                                   | 10 ++--------
 debian/control                                     | 23 +---------------------
 debian/libkactivities-bin.install                  |  8 ++++++++
 5 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/debian/activitymanager-uihandler-declarative.install b/debian/activitymanager-uihandler-declarative.install
deleted file mode 100644
index fe98e45..0000000
--- a/debian/activitymanager-uihandler-declarative.install
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 754d260..0000000
--- a/debian/activitymanager-uihandler-kdialog.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/kde4/activitymanager_uihandler_kdialog.so
diff --git a/debian/changelog b/debian/changelog
index b4da3d6..4bba565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,14 +2,8 @@ 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.
+    - Update libactivities6.symbols for new symbols.
+    - Update libkactivities-bin.install for changed files.
 
   [ Philip Muškovac ]
   * Merge with debian git, remaining changes: 
diff --git a/debian/control b/debian/control
index 1704f02..60a6d10 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,7 @@ Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivi
 
 Package: libkactivities-bin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- activitymanager-uihandler-kdialog | activitymanager-uihandler
+Depends: ${shlibs:Depends}, ${misc: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),
@@ -29,26 +28,6 @@ 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 3e7dc4c..a01c75b 100644
--- a/debian/libkactivities-bin.install
+++ b/debian/libkactivities-bin.install
@@ -3,8 +3,16 @@ usr/lib/kde4/activitymanager_plugin_activityranking.so
 usr/lib/kde4/activitymanager_plugin_globalshortcuts.so
 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/kactivitymanagerd_fileitem_linking_plugin.so
 usr/lib/kde4/kio_activities.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
 usr/share/kde4/services/activities.protocol
 usr/share/kde4/services/activitymanager-plugin-activityranking.desktop
 usr/share/kde4/services/activitymanager-plugin-globalshortcuts.desktop

-- 
kactivities packaging