[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=16a8a95

The following commit has been merged in the master branch:
commit 16a8a95d01ce6bc909d04bab25a150c3887448f8
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Fri Jul 27 10:57:38 2012 +0100

    fix debian/libkactivities-bin.install
---
 debian/libkactivities-bin.install | 2 --
 debian/source/local-options       | 1 -
 2 files changed, 3 deletions(-)

diff --git a/debian/libkactivities-bin.install b/debian/libkactivities-bin.install
index a01c75b..ed2196b 100644
--- a/debian/libkactivities-bin.install
+++ b/debian/libkactivities-bin.install
@@ -1,5 +1,4 @@
 usr/bin/kactivitymanagerd
-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
@@ -14,7 +13,6 @@ 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
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
kactivities packaging