[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 1 09:05:31 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=0b94e01

The following commit has been merged in the master branch:
commit 0b94e016a3d74dab994e0c7a92688d68f76a9cbf
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Wed Jun 6 15:32:38 2012 +0200

    * Merge with Debian git repository, remaining changes:
      - Build plasma-widget-kdeobservatory
      - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
        kde-wallpapers
      - Don't install kimpanel in plasma-widget-addons.install
      - Build against libboost1.49-dev
      - plasma-widgets-addons suggests plasma-widget-lancelot instead of
        recommends
      - Do not build-dep on libscim-dev
      - Add build-dep on libqwt-dev, libglib2.0-dev, shared-mime-info
    * New upstream beta release.
      - Drop kubuntu_support_new_fdo_desktop_actions.diff, merged upstream.
      - Build-depend on libqoauth-dev and libqjson-dev.
      - Update install files.
---
 debian/changelog                                   |  92 +++++++++++++-
 debian/control                                     | 135 +++++++++++++++------
 debian/not-installed                               |   2 -
 .../kubuntu_support_new_fdo_desktop_actions.diff   |  97 ---------------
 debian/patches/series                              |   1 -
 debian/plasma-dataengines-addons.install           |   9 +-
 debian/plasma-runners-addons.install               |  12 ++
 debian/plasma-wallpapers-addons.install            |   4 +-
 debian/plasma-widget-kimpanel-backend-ibus.install |   2 -
 .../plasma-widget-kimpanel-backend-ibus.postinst   |  33 -----
 debian/plasma-widget-kimpanel-backend-ibus.prerm   |  30 -----
 debian/plasma-widget-kimpanel.install              |   5 +-
 debian/plasma-widgets-addons.install               |  39 ++++--
 debian/rules                                       |   8 +-
 debian/source/local-options                        |   1 +
 debian/watch                                       |   2 +
 debian/xinput/ibus-kde                             |  16 ---
 17 files changed, 244 insertions(+), 244 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4d0536..48713e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,65 @@
+kdeplasma-addons (4:4.8.80-0ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with Debian git repository, remaining changes:
+    - Build plasma-widget-kdeobservatory
+    - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
+      kde-wallpapers
+    - Don't install kimpanel in plasma-widget-addons.install
+    - Build against libboost1.49-dev
+    - plasma-widgets-addons suggests plasma-widget-lancelot instead of
+      recommends
+    - Do not build-dep on libscim-dev
+    - Add build-dep on libqwt-dev, libglib2.0-dev, shared-mime-info
+  * New upstream beta release.
+    - Drop kubuntu_support_new_fdo_desktop_actions.diff, merged upstream.
+    - Build-depend on libqoauth-dev and libqjson-dev.
+    - Update install files.
+
+ -- Felix Geyer <debfx at ubuntu.com>  Wed, 06 Jun 2012 11:03:36 +0200
+
+kdeplasma-addons (4:4.8.4-0r1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+  [ Eshat Cakar ]
+  * Add watch file.
+  * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
+
+ -- Eshat Cakar <info at eshat.de>  Wed, 06 Jun 2012 00:08:10 +0200
+
+kdeplasma-addons (4:4.8.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * Team upload.
+
+  [ Eshat Cakar ]
+  * Bump various kde build dependecies to 4:4.8:
+    - kdelibs5-dev
+    - kdepimlibs5-dev
+    - kde-workspace-dev
+  * Update not-installed files.
+  * Update installed files.
+  * Add libdbusmenu-qt-dev to build dependecies to support icontasks widget.
+  * Remove obsolete lintian override:
+    package-name-doesnt-match-sonames libkimpanelruntime0
+
+  [ Pino Toscano ]
+  * Add marble-4.7-compat.diff to make the marble plasma wallpaper compile
+    also with marble 4.7.
+  * Split the kimpanel Plasma widget in an own plasma-widget-kimpanel package.
+  * Make plasma-widgets-addons suggest plasma-widget-kimpanel.
+  * Update descriptions.
+  * Build depend on libibus-1.0-dev to add IBUS support in kimpanel.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.8.3.
+  * Bump Standards-Version to 3.9.3, no changes needed.
+
+  [ Pino Toscano ]
+  * Improve the description of plasma-dataengines-addons. (Closes: #674596)
+
+ -- Modestas Vainius <modax at debian.org>  Sun, 27 May 2012 02:38:37 +0300
+
 kdeplasma-addons (4:4.8.3-0ubuntu1) quantal; urgency=low
 
   * New upstream release
@@ -87,6 +149,22 @@ kdeplasma-addons (4:4.7.90-0ubuntu1) precise; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2011 14:17:52 +0000
 
+kdeplasma-addons (4:4.7.4-2) unstable; urgency=low
+
+  * Team upload. Upload to unstable.
+  * Update uploaders, remove Armin.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 07 Mar 2012 11:25:47 +0100
+
+kdeplasma-addons (4:4.7.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Dec 2011 01:40:15 +0100
+
 kdeplasma-addons (4:4.7.3-0ubuntu3) precise; urgency=low
 
   * Add build-dep on shared-mime-info, also needed
@@ -126,7 +204,7 @@ kdeplasma-addons (4:4.7.3-0ubuntu1) precise; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:46:45 +0000
 
-kdeplasma-addons (4:4.7.2-0r0) UNRELEASED; urgency=low
+kdeplasma-addons (4:4.7.2-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -135,11 +213,19 @@ kdeplasma-addons (4:4.7.2-0r0) UNRELEASED; urgency=low
     - Bump kde-sc-dev-latest build dependency to 4:4.7.2.
     - Bump the rest of the KDE SC build depends to 4:4.7.
   * Update installed files.
-  
+
   [ Eshat Cakar ]
   * Add myself to uploaders
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2011 00:17:34 +0200
+  [ Pino Toscano ]
+  * Improve descriptions of plasma-widgets-addons, plasma-runners-addons,
+    and plasma-wallpapers-addons listing all the plugins contained in each.
+  * Manage some packages renamings:
+    - Build depend on kde-workspace-dev instead of kdebase-workspace-dev.
+    - kdeplasma-addons-dbg depends on kde-workspace-dbg instead of
+      kdebase-workspace-dbg. (Closes: #649963)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:43:51 -0300
 
 kdeplasma-addons (4:4.6.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dd2e3f8..15b5f1b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,21 @@ Section: utils
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
- Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
- José Manuel Santamaría Lema <panfaust at gmail.com>, Eshat Cakar <info at eshat.de>
-Build-Depends: kde-sc-dev-latest (>= 4:4.8.3),
+Uploaders: Sune Vuorela <sune at debian.org>,
+ Fathi Boudra <fabo at debian.org>,
+ Modestas Vainius <modax at debian.org>,
+ George Kiagiadakis <kiagiadakis.george at gmail.com>,
+ José Manuel Santamaría Lema <panfaust at gmail.com>,
+ 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),
- kdelibs5-dev (>= 4:4.8.1), kdepimlibs5-dev (>= 4:4.8.1), kde-workspace-dev (>= 4:4.8.1),
- libkexiv2-dev (>= 4:4.8.1), libmarble-dev (>= 4:4.8.1),
+ kdelibs5-dev (>= 4:4.8), kdepimlibs5-dev (>= 4:4.8), kde-workspace-dev (>= 4:4.8),
+ libkexiv2-dev (>= 4:4.7), libmarble-dev (>= 4:4.7),
  libqt4-opengl-dev, libboost1.49-dev, libqimageblitz-dev, libeigen2-dev, libxrender-dev,
  shared-desktop-ontologies, libattica-dev, libxtst-dev, libqalculate-dev,
- libqca2-dev, libqtwebkit-dev, libqwt-dev, libglib2.0-dev, shared-mime-info,
- libdbusmenu-qt-dev
-Standards-Version: 3.9.2
+ libqca2-dev, libqtwebkit-dev, libdbusmenu-qt-dev, libibus-1.0-dev,
+ libqwt-dev, libglib2.0-dev, shared-mime-info, libqoauth-dev, libqjson-dev
+Standards-Version: 3.9.3
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
@@ -42,16 +45,61 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
  plasma-dataengines-addons (= ${binary:Version}),
-Suggests: plasma-widget-lancelot
-Replaces: plasma-widget-system-status, plasma-engine-kdeobservatory (<< 4.8.0),
- plasma-widget-icon-tasks
-Breaks: plasma-widget-system-status, plasma-engine-kdeobservatory (<< 4.8.0),
- plasma-widget-icon-tasks
+Suggests: plasma-widget-lancelot, plasma-widget-kimpanel
 Description: additional widgets for Plasma
  This package contains additional Plasma widgets shipped in the Plasma
  addons module. Install it if you want a variety of widgets on your Plasma
  desktop.
  .
+ This package provides the following widgets:
+  * Binary Clock
+  * Black Board
+  * Bookmarks
+  * Bouncy Ball
+  * Bubblemon
+  * Calculator
+  * Character Selector
+  * Color Picker
+  * Comic Strip
+  * Dictionary
+  * Eyes
+  * Fifteen Puzzle
+  * File Watcher
+  * Fuzzy Clock
+  * Icon Tasks
+  * Incoming Message
+  * Knowledge Base
+  * Konqueror Profiles
+  * Konsole Profile
+  * LCD Weather Station
+  * Leave a Note
+  * Life
+  * Luna
+  * Magnifique
+  * Media Player
+  * Microblogging
+  * News
+  * Notes
+  * Now Playing
+  * OpenDesktop.org Community
+  * OpenDesktop.org Social News
+  * Paste
+  * Pastebin
+  * Picture Frame
+  * Plasmaboard
+  * Previewer
+  * Qalculate!
+  * Remember The Milk
+  * RSSNOW
+  * Show Widget Dashboard
+  * Show Desktop
+  * Spell Check
+  * System Load Viewer
+  * Timer
+  * Unit Converter
+  * Weather Forecast
+  * Web Slice
+ .
  This package is part of the KDE Plasma addons module.
 
 Package: plasma-containments-addons
@@ -72,11 +120,10 @@ Package: plasma-dataengines-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<< 4:4.4.60), plasma-widgets-addons (<< 4:4.4.60)
 Description: additional data engines for Plasma
  This package contains additional Plasma data engines shipped in Plasma
- addons module. These engines are needed by some plasma widgets
- Plasma widgets, but they may be useful for any other Plasma widget too.
+ addons module. These engines are needed by some Plasma widget shipped with
+ plasma-widgets-addons, but they may be useful for any other Plasma widgets too.
  .
  This package is part of the KDE Plasma addons module.
 
@@ -89,6 +136,24 @@ Description: additional runners for Plasma and Krunner
  (the "run command" dialog of Plasma) to reveal special search results.
  If you use krunner a lot, you will probably like this package.
  .
+ This package contains the following runners:
+  * Audio Player Control
+  * Calendar Events
+  * Contacts
+  * Date and Time
+  * Kate Sessions
+  * KDE TechBase
+  * KDE Userbase Documentation
+  * Konqueror Sessions
+  * Konsole Sessions
+  * Kopete Contacts
+  * Special Characters
+  * Spell Checker
+  * Unit Converter
+  * Web Browser History
+  * Wikipedia
+  * Wikitravel
+ .
  This package is part of the KDE Plasma addons module.
 
 Package: plasma-wallpapers-addons
@@ -100,13 +165,22 @@ Replaces: plasma-dataengines-addons (<= 4:4.3.0-1)
 Description: additional wallpaper plugins for Plasma
  This package contains additional Plasma wallpaper plugins that are used in 
  the Plasma desktop to give marble, mandelbrot and other such wallpapers.
+ .
+ This package contains the following wallpaper plugins:
+  * Globe (Marble)
+  * Mandelbrot
+  * Pattern
+  * Picture of the day
+  * Virus
+  * Weather
+ .
  This package is part of the KDE Plasma addons module.
 
 Package: plasma-widget-lancelot
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: plasma-applet-lancelot, liblancelot0, liblancelot0a
+Replaces: plasma-applet-lancelot
 Conflicts: plasma-applet-lancelot
 Description: lancelot widget for Plasma
  Lancelot is an application launcher menu (or ALI) for Plasma designed to
@@ -119,21 +193,12 @@ Package: plasma-widget-kimpanel
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: plasma-widget-kimpanel-backend-ibus
-Replaces: plasma-widget-kimpanel-backend-ibus
-Description: addons for KDE 4 Plasma - universal input method widget
- Kimpanel is a Plasma widget for the ibus input method.
+Replaces: plasma-widgets-addons (<< 4:4.8.80)
+Breaks: plasma-widgets-addons (<< 4:4.8.80)
+Description: KIMPanel widget for Plasma
+ This package provides the KDE Input Method Panel widget for Plasma.
  .
- This package is part of the KDE plasma addons module.
-
-#Package: plasma-widget-kimpanel-backend-ibus
-#Architecture: all
-#Section: kde
-#Depends: ${shlibs:Depends}, ${misc:Depends}, ibus-qt4, python
-#Description: addons for KDE 4 Plasma - universal input method widget
-# Kimpanel is a a Plasma widget for the ibus input method.
-# .
-# This package contains the ibus backend for kimpanel.
+ This package is part of the KDE Plasma addons module.
 
 Package: plasma-widget-kdeobservatory
 Architecture: any
@@ -141,12 +206,12 @@ Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: plasma-dataengines-addons (<< 4:4.8.0)
 Breaks: plasma-dataengines-addons (<< 4:4.8.0)
-Description: addons for KDE 4 Plasma - KDE development tracking tool
+Description: KDE development tracking widget for Plasma
  The KDE Observatory Plasma widget is a way to track various metrics of the
  KDE project as a whole, including commit counts, Krazy2 report numbers for
  various KDE modules, and other statistics.
  .
- This package is part of the KDE plasma addons module.
+ This package is part of the KDE Plasma addons module.
 
 Package: kdeplasma-addons-dbg
 Section: debug
@@ -154,7 +219,7 @@ Architecture: any
 Priority: extra
 Depends: ${misc:Depends}, plasma-widgets-addons (= ${binary:Version}), plasma-dataengines-addons (= ${binary:Version}),
  plasma-runners-addons (= ${binary:Version}), plasma-widget-lancelot (= ${binary:Version}),
- plasma-wallpapers-addons (= ${binary:Version}), kde-workspace-dbg
+ plasma-wallpapers-addons (= ${binary:Version}), plasma-widget-kimpanel (= ${binary:Version}), kde-workspace-dbg
 Description: debugging symbols for kdeplasma-addons
  This package contains the debugging symbols associated with kdeplasma-addons.
  They will automatically be used by gdb for debugging kdeplasma-addons related
diff --git a/debian/not-installed b/debian/not-installed
index 9670908..f176af3 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,8 +3,6 @@
 ./usr/lib/libplasmapotdprovidercore.so
 ./usr/lib/libplasmaweather.so
 ./usr/lib/librtm.so
-./usr/lib/libkimpanelruntime.so
-./usr/share/dbus-1/interfaces/org.kde.impanel.xml
 ./usr/lib/libplasma_groupingcontainment.so
 
 # lancelot-dev stuff. Do not ship
diff --git a/debian/patches/kubuntu_support_new_fdo_desktop_actions.diff b/debian/patches/kubuntu_support_new_fdo_desktop_actions.diff
deleted file mode 100644
index 733bc7b..0000000
--- a/debian/patches/kubuntu_support_new_fdo_desktop_actions.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-From 934743adaf468e377ff858be03c605a570391e3f Mon Sep 17 00:00:00 2001
-From: Felix Geyer <debfx-kde at fobos.de>
-Date: Sun, 1 Apr 2012 19:19:59 +0200
-Subject: [PATCH] Support new FD.o desktop actions.
-Forwarded: https://git.reviewboard.kde.org/r/104462/
-
----
- applets/icontasks/unityitem.cpp |   40 ++++++++++++++++++++++++--------------
- applets/icontasks/unityitem.h   |    3 ++
- 2 files changed, 28 insertions(+), 15 deletions(-)
-
-diff --git a/applets/icontasks/unityitem.cpp b/applets/icontasks/unityitem.cpp
-index f653e4f..f952a45 100644
---- a/applets/icontasks/unityitem.cpp
-+++ b/applets/icontasks/unityitem.cpp
-@@ -28,7 +28,6 @@
- #include <QtGui/QAction>
- #include <QtGui/QMenu>
- #include <KDE/KDesktopFile>
--#include <KDE/KConfigGroup>
- #include <KDE/KRun>
- #include <KDE/KIcon>
- #include <dbusmenuimporter.h>
-@@ -215,24 +214,35 @@ void UnityItem::readStaticMenu()
- 
-             KDesktopFile df(m_desktopFile);
-             KConfigGroup de(&df, "Desktop Entry");
--            QStringList  shortCuts = de.readEntry("X-Ayatana-Desktop-Shortcuts", QString()).split(';');
--
--            foreach (QString shortcut, shortCuts) {
--                KConfigGroup grp(&df, shortcut + " Shortcut Group");
--                QString name = grp.readEntry("Name", QString());
--                QString exec = grp.readEntry("Exec", QString());
--
--                if (!name.isEmpty() && !exec.isEmpty()) {
--                    QString icon = grp.readEntry("Icon", QString()); // ???
--                    QAction *action = icon.isEmpty() ? new QAction(name, this) : new QAction(KIcon(icon), name, this);
--                    action->setData(exec);
--                    m_staticMenu.append(action);
--                    connect(action, SIGNAL(triggered()), this, SLOT(menuActivated()));
--                }
-+
-+            QStringList shortCutsFdo = de.readEntry("Actions", QString()).split(';');
-+
-+            foreach (QString shortcut, shortCutsFdo) {
-+                parseDesktopAction(KConfigGroup(&df, "Desktop Action " + shortcut));
-+            }
-+
-+            QStringList shortCutsAyatana = de.readEntry("X-Ayatana-Desktop-Shortcuts", QString()).split(';');
-+
-+            foreach (QString shortcut, shortCutsAyatana) {
-+                parseDesktopAction(KConfigGroup(&df, shortcut + " Shortcut Group"));
-             }
-         }
-         m_staticDirty = false;
-     }
- }
- 
-+void UnityItem::parseDesktopAction(const KConfigGroup& grp)
-+{
-+    QString name = grp.readEntry("Name", QString());
-+    QString exec = grp.readEntry("Exec", QString());
-+
-+    if (!name.isEmpty() && !exec.isEmpty()) {
-+        QString icon = grp.readEntry("Icon", QString()); // ???
-+        QAction *action = icon.isEmpty() ? new QAction(name, this) : new QAction(KIcon(icon), name, this);
-+        action->setData(exec);
-+        m_staticMenu.append(action);
-+        connect(action, SIGNAL(triggered()), this, SLOT(menuActivated()));
-+    }
-+}
-+
- #include "unityitem.moc"
-diff --git a/applets/icontasks/unityitem.h b/applets/icontasks/unityitem.h
-index 7e00501..3a76b43 100644
---- a/applets/icontasks/unityitem.h
-+++ b/applets/icontasks/unityitem.h
-@@ -31,6 +31,8 @@
- #include <QtCore/QVariant>
- #include <QtCore/QString>
- 
-+#include <KDE/KConfigGroup>
-+
- class AbstractTaskItem;
- class QTimer;
- class QAction;
-@@ -72,6 +74,7 @@ public Q_SLOTS:
- 
- private:
-     void readStaticMenu();
-+    void parseDesktopAction(const KConfigGroup& grp);
- 
- private:
-     QString m_id;
--- 
-1.7.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9149ff5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_support_new_fdo_desktop_actions.diff
diff --git a/debian/plasma-dataengines-addons.install b/debian/plasma-dataengines-addons.install
index 97930c9..6c3bd05 100644
--- a/debian/plasma-dataengines-addons.install
+++ b/debian/plasma-dataengines-addons.install
@@ -1,5 +1,7 @@
 usr/lib/kde4/plasma_comic_krossprovider.so
 usr/lib/kde4/plasma_engine_comic.so
+usr/lib/kde4/plasma_engine_konqprofiles.so
+usr/lib/kde4/plasma_engine_konsoleprofiles.so
 usr/lib/kde4/plasma_engine_microblog.so
 usr/lib/kde4/plasma_engine_ocs.so
 usr/lib/kde4/plasma_engine_potd.so
@@ -19,6 +21,8 @@ usr/lib/libplasmaweather.so.4.8.0
 usr/lib/librtm.so.4
 usr/lib/librtm.so.4.8.0
 usr/share/kde4/apps/plasma/services/ocsPerson.operations
+usr/share/kde4/apps/plasma/services/org.kde.plasma.dataengine.konqprofiles.operations
+usr/share/kde4/apps/plasma/services/org.kde.plasma.dataengine.konsoleprofiles.operations
 usr/share/kde4/apps/plasma/services/rtmauth.operations
 usr/share/kde4/apps/plasma/services/rtmtask.operations
 usr/share/kde4/apps/plasma/services/rtmtasks.operations
@@ -29,6 +33,8 @@ usr/share/kde4/services/epodprovider.desktop
 usr/share/kde4/services/flickrprovider.desktop
 usr/share/kde4/services/oseiprovider.desktop
 usr/share/kde4/services/plasma-dataengine-comic.desktop
+usr/share/kde4/services/plasma-dataengine-konqprofiles.desktop
+usr/share/kde4/services/plasma-dataengine-konsoleprofiles.desktop
 usr/share/kde4/services/plasma-dataengine-microblog.desktop
 usr/share/kde4/services/plasma-dataengine-ocs.desktop
 usr/share/kde4/services/plasma-dataengine-potd.desktop
@@ -37,6 +43,3 @@ usr/share/kde4/services/plasma-packagestructure-comic.desktop
 usr/share/kde4/services/wcpotdprovider.desktop
 usr/share/kde4/servicetypes/plasma_comicprovider.desktop
 usr/share/kde4/servicetypes/plasma_potdprovider.desktop
-usr/lib/kde4/plasma_engine_kimpanel.so
-usr/share/kde4/services/plasma-dataengine-kimpanel.desktop
-usr/share/kde4/apps/plasma/services/kimpanel.operations
diff --git a/debian/plasma-runners-addons.install b/debian/plasma-runners-addons.install
index 0239178..e3cb20c 100644
--- a/debian/plasma-runners-addons.install
+++ b/debian/plasma-runners-addons.install
@@ -3,26 +3,37 @@ usr/lib/kde4/kcm_krunner_charrunner.so
 usr/lib/kde4/kcm_krunner_spellcheck.so
 usr/lib/kde4/kcm_plasma_runner_events.so
 usr/lib/kde4/krunner_audioplayercontrol.so
+usr/lib/kde4/krunner_bing.so
 usr/lib/kde4/krunner_browserhistory.so
 usr/lib/kde4/krunner_charrunner.so
 usr/lib/kde4/krunner_contacts.so
 usr/lib/kde4/krunner_converter.so
+usr/lib/kde4/krunner_duckduckgo.so
 usr/lib/kde4/krunner_katesessions.so
 usr/lib/kde4/krunner_konquerorsessions.so
 usr/lib/kde4/krunner_konsolesessions.so
 usr/lib/kde4/krunner_kopete.so
 usr/lib/kde4/krunner_mediawiki.so
 usr/lib/kde4/krunner_spellcheckrunner.so
+usr/lib/kde4/krunner_youtube.so
 usr/lib/kde4/plasma_runner_datetime.so
 usr/lib/kde4/plasma_runner_events.so
+usr/share/icons/hicolor/16x16/actions/youtube.png
+usr/share/icons/hicolor/22x22/actions/youtube.png
+usr/share/icons/hicolor/32x32/actions/youtube.png
+usr/share/icons/hicolor/48x48/actions/youtube.png
+usr/share/icons/hicolor/64x64/actions/youtube.png
+usr/share/icons/hicolor/scalable/actions/youtube.svgz
 usr/share/kde4/services/CharRunner_config.desktop
 usr/share/kde4/services/CharacterRunner.desktop
 usr/share/kde4/services/browserhistory.desktop
+usr/share/kde4/services/duckduckgo.desktop
 usr/share/kde4/services/katesessions.desktop
 usr/share/kde4/services/konquerorsessions.desktop
 usr/share/kde4/services/konsolesessions.desktop
 usr/share/kde4/services/plasma-runner-audioplayercontrol.desktop
 usr/share/kde4/services/plasma-runner-audioplayercontrol_config.desktop
+usr/share/kde4/services/plasma-runner-bing.desktop
 usr/share/kde4/services/plasma-runner-contacts.desktop
 usr/share/kde4/services/plasma-runner-converter.desktop
 usr/share/kde4/services/plasma-runner-datetime.desktop
@@ -34,3 +45,4 @@ usr/share/kde4/services/plasma-runner-spellchecker_config.desktop
 usr/share/kde4/services/plasma-runner-techbase.desktop
 usr/share/kde4/services/plasma-runner-wikipedia.desktop
 usr/share/kde4/services/plasma-runner-wikitravel.desktop
+usr/share/kde4/services/plasma-runner-youtube.desktop
diff --git a/debian/plasma-wallpapers-addons.install b/debian/plasma-wallpapers-addons.install
index 8e7c915..1b9673b 100644
--- a/debian/plasma-wallpapers-addons.install
+++ b/debian/plasma-wallpapers-addons.install
@@ -1,6 +1,7 @@
 usr/lib/kde4/plasma_wallpaper_mandelbrot.so
 usr/lib/kde4/plasma_wallpaper_marble.so
 usr/lib/kde4/plasma_wallpaper_pattern.so
+usr/lib/kde4/plasma_wallpaper_potd.so
 usr/lib/kde4/plasma_wallpaper_virus.so
 usr/lib/kde4/plasma_wallpaper_weather.so
 usr/share/kde4/apps/plasma_wallpaper_pattern/patterns/bees.desktop
@@ -39,7 +40,6 @@ usr/share/kde4/config/virus_wallpaper.knsrc
 usr/share/kde4/services/plasma-wallpaper-mandelbrot.desktop
 usr/share/kde4/services/plasma-wallpaper-marble.desktop
 usr/share/kde4/services/plasma-wallpaper-pattern.desktop
+usr/share/kde4/services/plasma-wallpaper-potd.desktop
 usr/share/kde4/services/plasma-wallpaper-virus.desktop
 usr/share/kde4/services/plasma-wallpaper-weather.desktop
-usr/lib/kde4/plasma_wallpaper_potd.so
-usr/share/kde4/services/plasma-wallpaper-potd.desktop
diff --git a/debian/plasma-widget-kimpanel-backend-ibus.install b/debian/plasma-widget-kimpanel-backend-ibus.install
deleted file mode 100644
index c702f0d..0000000
--- a/debian/plasma-widget-kimpanel-backend-ibus.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/ibus/ibus-ui-kde
-debian/xinput/ibus-kde /etc/X11/xinit/xinput.d/
diff --git a/debian/plasma-widget-kimpanel-backend-ibus.postinst b/debian/plasma-widget-kimpanel-backend-ibus.postinst
deleted file mode 100644
index 9c4c3d6..0000000
--- a/debian/plasma-widget-kimpanel-backend-ibus.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-set -e
-
-ua_inst () {
-	update-alternatives \
-        --install /etc/X11/xinit/xinput.d/$1 xinput-$1 \
-        /etc/X11/xinit/xinput.d/$2 $3 ;
-}
-
-case "$1" in
-    configure)
-        #ua_inst all_ALL ibus  0
-        ua_inst ja_JP   ibus-kde 60
-        ua_inst ko_KR   ibus-kde 60
-        ua_inst zh_CN   ibus-kde 60
-        ua_inst zh_TW   ibus-kde 60
-        ua_inst zh_HK   ibus-kde 60
-        ua_inst zh_SG   ibus-kde 60
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-
diff --git a/debian/plasma-widget-kimpanel-backend-ibus.prerm b/debian/plasma-widget-kimpanel-backend-ibus.prerm
deleted file mode 100644
index 234444f..0000000
--- a/debian/plasma-widget-kimpanel-backend-ibus.prerm
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-set -e
-
-ua_remove () {
-	update-alternatives \
-        --remove xinput-$1 \
-        /etc/X11/xinit/xinput.d/$2 ;
-}
-
-case "$1" in
-    remove|upgrade|deconfigure)
-        ua_remove all_ALL ibus-kde
-        ua_remove ja_JP   ibus-kde
-        ua_remove ko_KR   ibus-kde
-        ua_remove zh_CN   ibus-kde
-        ua_remove zh_TW   ibus-kde
-        ua_remove zh_HK   ibus-kde
-        ua_remove zh_SG   ibus-kde
-	;;
-    failed-upgrade)
-	;;
-    *)
-	echo "prerm called with unknown argument \`$1'" >&2
-	exit 1
-   ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/plasma-widget-kimpanel.install b/debian/plasma-widget-kimpanel.install
index 2f18710..7bcd616 100644
--- a/debian/plasma-widget-kimpanel.install
+++ b/debian/plasma-widget-kimpanel.install
@@ -1,4 +1,7 @@
+usr/lib/kde4/libexec/kimpanel-ibus-panel
 usr/lib/kde4/plasma_applet_kimpanel.so
+usr/lib/kde4/plasma_engine_kimpanel.so
+usr/share/kde4/apps/plasma/services/kimpanel.operations
 usr/share/kde4/config.kcfg/kimpanelconfig.kcfg
 usr/share/kde4/services/plasma-applet-kimpanel.desktop
-
+usr/share/kde4/services/plasma-dataengine-kimpanel.desktop
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index e096008..6f707a4 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -13,11 +13,10 @@ usr/lib/kde4/plasma_applet_fifteenPuzzle.so
 usr/lib/kde4/plasma_applet_fileWatcher.so
 usr/lib/kde4/plasma_applet_frame.so
 usr/lib/kde4/plasma_applet_fuzzy_clock.so
+usr/lib/kde4/plasma_applet_icontasks.so
 usr/lib/kde4/plasma_applet_incomingmsg.so
 usr/lib/kde4/plasma_applet_knowledgebase.so
 usr/lib/kde4/plasma_applet_kolourpicker.so
-usr/lib/kde4/plasma_applet_konqprofiles.so
-usr/lib/kde4/plasma_applet_konsoleprofiles.so
 usr/lib/kde4/plasma_applet_leavenote.so
 usr/lib/kde4/plasma_applet_life.so
 usr/lib/kde4/plasma_applet_luna.so
@@ -26,7 +25,6 @@ usr/lib/kde4/plasma_applet_mediaplayer.so
 usr/lib/kde4/plasma_applet_microblog.so
 usr/lib/kde4/plasma_applet_news.so
 usr/lib/kde4/plasma_applet_notes.so
-usr/lib/kde4/plasma_applet_nowplaying.so
 usr/lib/kde4/plasma_applet_opendesktop.so
 usr/lib/kde4/plasma_applet_opendesktop_activities.so
 usr/lib/kde4/plasma_applet_paste.so
@@ -85,6 +83,11 @@ usr/share/kde4/apps/bball/bounce.ogg
 usr/share/kde4/apps/bball/football.svgz
 usr/share/kde4/apps/desktoptheme/default/bubblemon/bubble.svg
 usr/share/kde4/apps/desktoptheme/default/fifteenPuzzle/blanksquare.svg
+usr/share/kde4/apps/desktoptheme/default/icontasks/badge.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/dropindicators.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/indicators.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/launcherseparator.svgz
+usr/share/kde4/apps/desktoptheme/default/icontasks/progress.svgz
 usr/share/kde4/apps/desktoptheme/default/rssnow/arrows.svgz
 usr/share/kde4/apps/desktoptheme/default/rssnow/background.svgz
 usr/share/kde4/apps/desktoptheme/default/rssnow/rssnow.svgz
@@ -96,10 +99,29 @@ usr/share/kde4/apps/desktoptheme/default/widgets/eyes.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/luna.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/microblog.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/notes.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/nowplaying/nocover.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/previewer-16.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/previewer-22.svgz
 usr/share/kde4/apps/desktoptheme/default/widgets/timer.svgz
+usr/share/kde4/apps/kdeplasma-addons/mediabuttonsrc
+usr/share/kde4/apps/plasma/plasmoids/konqprofiles/contents/ui/konqprofiles.qml
+usr/share/kde4/apps/plasma/plasmoids/konqprofiles/metadata.desktop
+usr/share/kde4/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles.qml
+usr/share/kde4/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/code/service.js
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/images/nocover.svgz
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/FullLayout.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/Label.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataLine.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataPanel.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/Mpris2.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/PlayPauseButton.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/PositionSlider.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/VLayout.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/nowplaying.qml
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/metadata.desktop
 usr/share/kde4/apps/plasma-applet-frame/picture-frame-default.jpg
 usr/share/kde4/apps/plasma-applet-opendesktop-activities/plasma-applet-opendesktop-activities.notifyrc
 usr/share/kde4/apps/plasma-applet-opendesktop/user.css
@@ -122,6 +144,7 @@ usr/share/kde4/services/plasma-applet-calculator.desktop
 usr/share/kde4/services/plasma-applet-charselect.desktop
 usr/share/kde4/services/plasma-applet-eyes.desktop
 usr/share/kde4/services/plasma-applet-fifteenPuzzle.desktop
+usr/share/kde4/services/plasma-applet-icontasks.desktop
 usr/share/kde4/services/plasma-applet-incomingmsg.desktop
 usr/share/kde4/services/plasma-applet-knowledgebase.desktop
 usr/share/kde4/services/plasma-applet-konqprofiles.desktop
@@ -159,11 +182,3 @@ usr/share/kde4/services/plasma-frame-default.desktop
 usr/share/kde4/services/plasma-kolourpicker-default.desktop
 usr/share/kde4/services/plasma-notes-default.desktop
 usr/share/kde4/services/plasma_applet_plasmaboard.desktop
-usr/lib/kde4/plasma_applet_icontasks.so
-usr/share/kde4/services/plasma-applet-icontasks.desktop
-usr/share/kde4/apps/desktoptheme/default/icontasks/indicators.svgz
-usr/share/kde4/apps/desktoptheme/default/icontasks/dropindicators.svgz
-usr/share/kde4/apps/desktoptheme/default/icontasks/progress.svgz
-usr/share/kde4/apps/desktoptheme/default/icontasks/badge.svgz
-usr/share/kde4/apps/desktoptheme/default/icontasks/launcherseparator.svgz
-usr/share/kde4/apps/kdeplasma-addons/mediabuttonsrc
diff --git a/debian/rules b/debian/rules
index ad9852a..588bb1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,6 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 override_dh_strip:
 	$(overridden_command) --dbg-package=kdeplasma-addons-dbg
 
-#override_dh_install:
-#	mkdir -p $(CURDIR)/debian/tmp/usr/lib/ibus/
-#	cp $(CURDIR)/applets/kimpanel/backend/ibus/panel.py \
-#		$(CURDIR)/debian/tmp/usr/lib/ibus/ibus-ui-kde
-#	$(overridden_command)
-
 override_dh_auto_clean:
 	$(overridden_command)
-	find applets/lancelot/tools/puck -name *.pyc -delete
+	find applets/lancelot/tools/puck -name *.pyc -delete || true
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..28c775d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/kdeplasma-addons-([\d\.]*).tar.xz
diff --git a/debian/xinput/ibus-kde b/debian/xinput/ibus-kde
deleted file mode 100644
index fe64104..0000000
--- a/debian/xinput/ibus-kde
+++ /dev/null
@@ -1,16 +0,0 @@
-XIM=ibus
-XIM_PROGRAM=/usr/bin/ibus-daemon
-XIM_ARGS=" --panel=/usr/lib/ibus/ibus-ui-kde"
-if [ -e /usr/lib/gtk-2.0/*/immodules/im-ibus.so ]; then
-    GTK_IM_MODULE=ibus
-else
-    GTK_IM_MODULE=xim
-fi
-
-if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
-	QT_IM_MODULE=ibus
-else
-	QT_IM_MODULE=xim
-fi
-DEPENDS="ibus, ibus-gtk, ibus-qt4, plasma-widget-kimpanel-backend-ibus"
-# vim:ft=sh:

-- 
KDE Plasma Addons module packaging

More information about the pkg-kde-commits mailing list