[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:24 UTC 2014


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

The following commit has been merged in the master branch:
commit a478b0c471179d3beba2071ce0b8251b1d849777
Author: Philip Muskovac <yofel at gmx.net>
Date:   Wed Jun 1 19:20:59 2011 +0200

    * Merge from debian. Remaining changes:
      - Keep our patch
      - Add debian/xinput folder
      - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
        plasma-widget-kimpanel-backend-ibus
      - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
        kdewallpapers, kdebase-workspace-wallpapers
      - Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
      - Don't install kimpanel in plasma-widget-addons
      - Build against libboost1.42-dev
      - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
        plasma-widgets-addons (<< 4:4.4.60)
      - plasma-widgets-addons suggests plasma-widget-lancelot instead of
        recommends
      - plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
---
 debian/KUBUNTU-DEBIAN-DIFFERENCES                  |   5 +-
 debian/changelog                                   | 245 ++++++++++++++++++++-
 debian/control                                     |  63 +++---
 debian/copyright                                   |  66 +++---
 debian/not-installed                               |  53 +++--
 debian/plasma-containments-addons.install          |  13 +-
 .../plasma-containments-addons.lintian-overrides   |   1 +
 debian/plasma-runners-addons.install               |   8 +-
 debian/plasma-widget-kimpanel-backend-ibus.install |   2 +
 debian/plasma-widget-kimpanel-backend-scim.install |   1 -
 debian/plasma-widget-kimpanel.install              |   2 -
 debian/plasma-widget-lancelot.install              |   4 +-
 debian/plasma-widget-lancelot.lintian-overrides    |   2 +-
 debian/plasma-widgets-addons.install               |  42 ++--
 debian/rules                                       |  21 +-
 15 files changed, 379 insertions(+), 149 deletions(-)

diff --git a/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 96d9e94..3b0ba04 100644
--- a/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -2,9 +2,7 @@
     - Add debian/xinput folder
     - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
       plasma-widget-kimpanel-backend-ibus
-    - Keep plasma-widget-kimpanel-backend-scim package commented
-    - Keep rules to install plasma-widget-kimpanel-backend-ibus
-    - Keep plasma-widget-kimpanel-backend-ibus.{postinst, prerm}
+    - Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
     - Don't install kimpanel in plasma-widget-addons
     - Build against libboost1.42-dev
     - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
@@ -13,3 +11,4 @@
       recommends
     - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
       plasma-widget-addons (<< 4:4.4.60)
+    - plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
diff --git a/debian/changelog b/debian/changelog
index b996c74..d712b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,71 @@
-kdeplasma-addons (4:4.6.3-0ubuntu1) UNRELEASED; urgency=low
+kdeplasma-addons (4:4.6.3-1ubuntu1) UNRELEASED; urgency=low
 
-  * New upstream release
-    - update kde-sc-dev-latest version
-    - drop kubuntu_05_comic_prefetch.diff, applied upstream
+  * Merge from debian. Remaining changes: 
+    - Keep our patch
+    - Add debian/xinput folder
+    - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
+      plasma-widget-kimpanel-backend-ibus
+    - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
+      kdewallpapers, kdebase-workspace-wallpapers
+    - Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
+    - Don't install kimpanel in plasma-widget-addons
+    - Build against libboost1.42-dev
+    - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
+      plasma-widgets-addons (<< 4:4.4.60)
+    - plasma-widgets-addons suggests plasma-widget-lancelot instead of
+      recommends
+    - plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
   * Update Vcs- links as the branch is now owned by kubuntu-packagers
 
- -- Philip Muškovac <yofel at kubuntu.org>  Fri, 06 May 2011 12:56:10 +0200
+ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 01 Jun 2011 17:08:25 +0200
+
+kdeplasma-addons (4:4.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.6.3.
+  * Bump Standards-Version to 3.9.2; no changes required.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 May 2011 02:41:39 +0300
+
+kdeplasma-addons (4:4.6.2-1) experimental; urgency=low
+
+  * New upstream release:
+    - fixes wetter.com forecast retrieval for some geographic regions
+      (Closes: #580518)
+    - fixes BBC forecast location retrieval (Closes: #578920)
+  * Update installed files.
+
+  [ Modestas Vainius ]
+  * Point debian/control Vcs fields to the new Git repository.
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
+  * Clean trailing whitespaces from the copyright file.
+  * Reorder Build-Depends a bit: move KDE SC ones nearer beginning next to each
+    other.
+
+  [ Pino Toscano ]
+  * Fix typo in description of plasma-widget-lancelot. (Closes: #591216)
+  * Clean up Replaces/Breaks from the pre-squeeze era whenever possible.
+
+  [ George Kiagiadakis ]
+  * Change my email address in uploaders.
+  * Bump kdelibs5-dev, kdepimlibs5-dev, kdebase-workspace-dev,
+    libkexiv2-dev and libmarble-dev build dependencies to version 4.6.
+  * Remove build dependency on libxml2-dev, not needed anymore.
+  * Update lintian overrides.
+  * Drop replaces/conflicts against liblancelot0/0a from
+    plasma-widget-lancelot, as they no longer have any common files.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.6.2.
+  * Add plasma-containments-addons package.
+  * Add libqtwebkit-dev build dependency.
+  * Bump Standards-Version to 3.9.1: update Breaks/Replaces/Conflicts.
+  * Update lintian overrides.
+  * Add myself to Uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 27 Apr 2011 12:23:44 +0300
 
 kdeplasma-addons (4:4.6.2-0ubuntu3) natty; urgency=low
 
@@ -359,6 +419,37 @@ kdeplasma-addons (4:4.4.3-0ubuntu1) lucid; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 04 May 2010 13:52:34 +0100
 
+kdeplasma-addons (4:4.4.2-1) experimental; urgency=low
+
+  * New upstream release:
+    - blubblemon animates correctly. (Closes: #558787)
+    - resolves some cyclical relayout crashes and some layout estetic
+      problems. (Closes: #564912)
+
+  [ Modestas Vainius ]
+  * Change my email address to modax at debian.org in Uploaders field.
+  * Fix Vcs-Browser URL.
+  * Add cmake to Build-Depends.
+  * Add kde-sc-dev-latest (>= 4:4.4.2) to Build-Depends.
+  * Bump Standards-Version to 3.8.4: no changes needed.
+  * Bump kdepimlibs5-dev build dependency to 4:4.4.
+  * Bump pkg-kde-tools build dependency to 0.6.4.
+  * Change libkexiv2-7-dev build dependency to libkexiv2-dev (>= 4:4.4).
+  * Add a symbol file for liblancelot0, build depend on dpkg-dev 1.15.5.
+  * Make dpkg-gensymbols not to fail if there are lost symbols in liblancelot0.
+  * Remove liblancelot0 to liblancelot0a, library is ABI/API incompatible.
+  * Add ${misc:Depends} to all binary packages.
+
+  [ George Kiagiadakis ]
+  * Bump kdelibs5-dev build dependency to >= 4:4.4.
+  * Bump kdebase-workspace-dev build dependency to >= 4:4.4.
+  * Bump libmarble-dev build dependency to >= 4:4.4.
+  * Add build dependency on shared-desktop-ontologies, libattica-dev,
+    libscim-dev, libxtst-dev, libqalculate-dev, libxml2-dev.
+  * Update installed files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Apr 2010 18:40:08 +0300
+
 kdeplasma-addons (4:4.4.2-0ubuntu2) lucid-proposed; urgency=low
 
   * Add kubuntu_01_fix_picture_of_the_day.diff from branch (LP: #566127)
@@ -585,6 +676,13 @@ kdeplasma-addons (4:4.3.3-0ubuntu1) lucid; urgency=low
 
  -- Alessandro Ghersi <alessandro-ghersi at kubuntu.org>  Mon, 16 Nov 2009 03:40:10 +0100
 
+kdeplasma-addons (4:4.3.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove 01_fix_armel_build patch, merged upstream.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 10 Oct 2009 19:43:05 +0200
+
 kdeplasma-addons (4:4.3.2-0ubuntu6) lucid; urgency=low
 
   * Update kubuntu_02_microblog_default_configuration.diff fix
@@ -649,6 +747,22 @@ kdeplasma-addons (4:4.3.1-2) unstable; urgency=low
 
  -- Sune Vuorela <debian at pusling.com>  Wed, 09 Sep 2009 08:42:03 +0200
 
+kdeplasma-addons (4:4.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by George Kiagiadakis:
+
+  * Remove build dependency on libxcomposite-dev and libxdamage-dev
+    as they are no longer needed for building lancelot compositing
+    support.
+
+  +++ Changes by Fathi Boudra:
+
+  * Bump KDE build dependencies to 4.3.1.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Aug 2009 17:48:16 +0300
+
 kdeplasma-addons (4:4.3.1-0ubuntu3) karmic; urgency=low
 
   * Add wallpapers/mandelbrot/mandelbrot.cpp armel fixes to
@@ -714,6 +828,15 @@ kdeplasma-addons (4:4.3.0-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Aug 2009 15:53:02 +0200
 
+kdeplasma-addons (4:4.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump to Standards-Version: 3.8.2, no changes required.
+  * Bump build dependencies to >= 4.3.0.
+  * Update installed files.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 04 Aug 2009 09:20:58 +0200
+
 kdeplasma-addons (4:4.3.0-0ubuntu4) karmic; urgency=low
 
   * Add kubuntu_04_netbook_runners.diff from 
@@ -887,6 +1010,22 @@ kdeplasma-addons (4:4.2.1-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Mar 2009 13:52:37 +0100
 
+kdeplasma-addons (4:4.2.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Modestas Vainius:
+
+  * Point Debian Vcs URLs to pkg-kde/trunk (new location).
+  * Rename plasma-applets-addons to plasma-widgets-addons, add appropriate
+    conflicts/replaces for the old packages.
+  * Rename plasma-applets-lancelot to plasma-widgets-lancelot, add appropriate
+    conflicts/replaces for the old package.
+  * Replace all references to plasma "applet" with "widget".
+  * Bump KDE build depends to 4.2.1.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 27 Feb 2009 23:49:30 +0200
+
 kdeplasma-addons (4:4.2.1-0ubuntu2) jaunty; urgency=low
 
   * Reupload since all built failed due to missing deps appart
@@ -901,6 +1040,54 @@ kdeplasma-addons (4:4.2.1-0ubuntu1) jaunty; urgency=low
 
  -- Jonathan Thomas <echidnaman at kubuntu.org>  Fri, 27 Feb 2009 17:25:34 -0500
 
+kdeplasma-addons (4:4.2.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Includes lancelot (Closes: #499222).
+
+  +++ Changes by Modestas Vainius:
+
+  * Drop explicit build depend on cmake.
+  * Build depend on kdelibs5-dev and kdepimlibs5-dev
+    explicitly (4.2.0). Bump kdebase-workspace-dev dependency to
+    4:4.2.0.
+  * Build depend on libkexiv2-6-dev and python (the latter is needed by
+    lancelot at build time).
+  * Add debian/installgen and update install files.
+  * Bump Standards-Version to 3.8.0: add README.source.
+  * Drop 97_fix_target_link_libraries.diff, no longer needed.
+  * Update install files.
+  * Add a clean rule to *.pyc from applets/lancelot/tools/puck.
+  * Bump liblancelot0 shlibs on each new upstream release.
+  * Do not build depend on libplasma-dev. Plasma headers are in kdelibs5-dev
+    for now.
+  * Bump debian/compat and debhelper build dependency to v7 (to get more
+    sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
+
+  ++ Changes by George Kiagiadakis:
+
+  * Add new packages:
+    - plasma-applets-addons - contains the plasma applets.
+    - plasma-dataengines-addons - contains the plasma dataengines.
+    - plasma-runners-addons - contains the plasma runners.
+    - plasma-applet-lancelot - contains the lancelot applet.
+    - liblancelot0 - contains the lancelot shared library.
+  * Make kdeplasma-addons be a metapackage that installs all of the above.
+  * Rename kdeplasma-addons-dev to liblancelot-dev.
+  * Remove the kdeplasma-addons-libs4 and kdeplasma-addons-data packages.
+  * Drop explicit build dependency on libglu1-mesa-dev.
+
+  +++ Changes by Sune Vuorela:
+
+  * Update copyright file.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:39:52 +0200
+
 kdeplasma-addons (4:4.2.0-0ubuntu3) jaunty; urgency=low
 
   [ Michal Zajac ]
@@ -1054,6 +1241,28 @@ kdeplasma-addons (4:4.1.80-0ubuntu1) jaunty; urgency=low
 
  -- Jonathan Thomas <echidnaman at kubuntu.org>  Wed, 26 Nov 2008 20:14:49 -0500
 
+kdeplasma-addons (4:4.1.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Sune Vuorela
+
+  * bump b-d.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Add build depend on kdepimlibs5-dev, it is needed now since
+    kdebase-workspace-dev depends have changed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Jan 2009 01:53:17 +0100
+
+kdeplasma-addons (4:4.1.3-1) experimental; urgency=low
+
+  * New upstream release
+    - bump b-d.
+
+ -- Sune Vuorela <debian at pusling.com>  Sat, 01 Nov 2008 16:43:04 +0100
+
 kdeplasma-addons (4:4.1.2-1ubuntu2) jaunty; urgency=low
 
   * No change rebuild for new dh_sameversiondeps
@@ -1089,6 +1298,17 @@ kdeplasma-addons (4:4.1.2-0ubuntu1) intrepid; urgency=low
 
  -- Jonathan Thomas <echidnaman at kubuntu.org>  Fri, 26 Sep 2008 09:26:38 -0400
 
+kdeplasma-addons (4:4.1.1-1) experimental; urgency=low
+
+  * New upstreams release.
+
+  +++ Changes by Sune Vuorela:
+
+  * Change 97_ patch to fit with upstream changes and
+    debian specific pimlibs changes
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 29 Aug 2008 08:46:37 +0200
+
 kdeplasma-addons (4:4.1.1-0ubuntu2) intrepid; urgency=low
 
   * Rebuild against kdelibs 4:4.1.1+really4.1.1
@@ -1112,6 +1332,20 @@ kdeplasma-addons (4:4.1.1-0ubuntu1) intrepid; urgency=low
 
  -- Jonathan Thomas (The man) <echidnaman at gmail.com>  Fri, 29 Aug 2008 08:11:18 -0400
 
+kdeplasma-addons (4:4.1.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Modestas Vainius:
+
+  * Adapt sameVersionDep substvars to new dh_sameversiondeps syntax.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Update installed files and build depend version.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 28 Jul 2008 03:12:14 +0200
+
 kdeplasma-addons (4:4.1.0-0ubuntu3) intrepid; urgency=low
 
   * Fix typo in kdeplasma-addons-libs4' Conflicts: list.
@@ -1349,3 +1583,4 @@ extragear-plasma (3.94.0-1) experimental; urgency=low
   * Initial release.
 
  -- Armin Berres <trigger+debian at space-based.de>  Wed, 24 Oct 2007 01:14:25 +0200
+
diff --git a/debian/control b/debian/control
index 21aa2b0..bb8ef42 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,16 @@ 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>
+ 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>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.3),
- cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.9),
- kdelibs5-dev (>= 4:4.5.2-0ubuntu1), kdepimlibs5-dev (>= 4:4.5), kdebase-workspace-dev (>= 4:4.5),
- libqt4-opengl-dev, libboost1.42-dev, libkexiv2-dev (>= 4:4.5), python, libmarble-dev (>= 4:4.5),
- libqimageblitz-dev, libeigen2-dev, libxrender-dev, shared-desktop-ontologies, libattica-dev,
- libxtst-dev, libqalculate-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev, libqca2-dev,
- libxml2-dev
-Standards-Version: 3.8.4
+ cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
+ kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), kdebase-workspace-dev (>= 4:4.6),
+ libkexiv2-dev (>= 4:4.6), libmarble-dev (>= 4:4.6), shared-mime-info, libglib2.0-dev,
+ libqt4-opengl-dev, libboost1.42-dev, libqimageblitz-dev, libeigen2-dev, libxrender-dev,
+ shared-desktop-ontologies, libattica-dev, libxtst-dev, libqwt5-qt4-dev, libqalculate-dev,
+ libqca2-dev, libqtwebkit-dev
+Standards-Version: 3.9.2
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kdeplasma-addons/ubuntu
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kdeplasma-addons/ubuntu
@@ -23,7 +24,8 @@ Section: kde
 Depends: ${misc:Depends}, plasma-widgets-addons (>= ${source:Version}),
  plasma-runners-addons (>= ${source:Version}),
  plasma-widget-lancelot (>= ${source:Version}),
- plasma-wallpapers-addons (>= ${source:Version})
+ plasma-wallpapers-addons (>= ${source:Version}),
+ plasma-containments-addons (>= ${source:Version})
 Description: addons for Plasma
  The KDE Plasma addons module is a collection of additional Plasma
  data engines, widgets and krunner plugins. It is part of
@@ -47,11 +49,25 @@ Description: additional widgets for Plasma
  .
  This package is part of the KDE Plasma addons module.
 
+Package: plasma-containments-addons
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: additional containment plugins for Plasma
+ This package contains additional Plasma containment plugins. These plugins
+ allow the user to layout Plasma widgets in groups.
+ .
+ Plasma widgets can be added to a group dropping them from the Add Widgets
+ Explorer or moving them over the group. If it is necessary (like in the grid
+ group) a drop zone will be shown (like the one in the panel).
+ .
+ This package is part of the KDE Plasma addons module.
+
 Package: plasma-dataengines-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<< 4:4.4.60), plasma-widget-addons (<< 4:4.4.60)
+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
@@ -63,8 +79,6 @@ Package: plasma-runners-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1)
-Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4
 Description: additional runners for Plasma and Krunner
  This package contains additional Plasma runners that are used in krunner
  (the "run command" dialog of Plasma) to reveal special search results.
@@ -78,24 +92,18 @@ Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
  plasma-dataengines-addons (= ${binary:Version}), kdewallpapers,
  kdebase-workspace-wallpapers
+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 is part of the KDE Plasma addons module.
 
-Package: plasma-containments-addons
-Architecture: any
-Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: additional containment plugins for Plasma
- This package contains additional Plasma containment plugins.
- This package is part of the KDE Plasma addons module.
-
 Package: plasma-widget-lancelot
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), liblancelot0a, liblancelot0
+Replaces: plasma-applet-lancelot, liblancelot0, liblancelot0a
+Conflicts: plasma-applet-lancelot
 Description: lancelot widget for Plasma
  Lancelot is an application launcher menu (or ALI) for Plasma designed to
  provide a place from which all your jobs begin. It provides quick access
@@ -121,17 +129,6 @@ Description: addons for KDE 4 Plasma - universal input method widget
  .
  This package contains the ibus backend for kimpanel.
 
-# Disabled, scim unmaintained upstream and in universe
-#
-#Package: plasma-widget-kimpanel-backend-scim
-#Architecture: any
-#Section: kde
-#Depends: ${shlibs:Depends}
-#Description: addons for KDE 4 Plasma - universal input method widget
-# Kimpanel is a a Plasma widget for the scim and fcitx input methods.
-# .
-# This package contains the scim backend for kimpanel
-
 Package: plasma-widget-kdeobservatory
 Architecture: any
 Section: kde
@@ -147,8 +144,6 @@ Package: kdeplasma-addons-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Conflicts: kdeplasmoid-dbg
-Replaces: kdeplasmoid-dbg
 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}), kdebase-workspace-dbg
diff --git a/debian/copyright b/debian/copyright
index 2450b6e..35d6c19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,20 +5,20 @@ It was downloaded from ftp://ftp.kde.org
 
 Upstream Authors and copyright holders:
     Copyright (C) 1989, 1991, 1999-2002, 2007 Free Software Foundation, Inc.
-    Copyright (C) 1996  Christopher Osburn, Lunar Outreach Services, <chris at speakeasy.org>                                                                                           
-    Copyright (C) 1998,2000 Stephan Kulow <coolo at kde.org>                                                                                                                            
-    Copyright (c) 1996-2002 the kicker authors. (fuzzy logic)                                                                                                                    
-    Copyright (C) 2005,2006,2007 Siraj Razick <siraj at kde.org>                                                                                                                    
-    Copyright (C) 2006-2007 Rivo Laks <rivolaks at hot.ee>                                                                                                                          
-    Copyright (C) 2007,2008 Alex Merry <alex.merry at kdemail.net>                                                                                                                  
-    Copyright (C) 2007, 2008 Petri Damsten <damu at iki.fi>                                                                                                                         
-    Copyright (C) 2007, 2008 Rob Scheepmaker <r.scheepmaker at student.utwente.nl>                                                                                                  
-    Copyright (C) 2007-2008 Shawn Starr <shawn.starr at rogers.com>                                                                                                                 
-    Copyright (C) 2007 Alexis Ménard <darktears31 at gmail.com>                                                                                                                    
-    Copyright (C) 2007 André Duffeck <duffeck at kde.org>                                                                                                                          
-    Copyright (C) 2007-2008 Anne-Marie Mahfouf <annma at kde.org>                                                                                                                        
-    Copyright (C) 2007 Antonio Vinci <mercurio at personellarete.it>                                                                                                                
-    Copyright (C) 2007-2008 Artur Duque de Souza <morpheuz at gmail.com>                                                                                                                 
+    Copyright (C) 1996  Christopher Osburn, Lunar Outreach Services, <chris at speakeasy.org>
+    Copyright (C) 1998,2000 Stephan Kulow <coolo at kde.org>
+    Copyright (c) 1996-2002 the kicker authors. (fuzzy logic)
+    Copyright (C) 2005,2006,2007 Siraj Razick <siraj at kde.org>
+    Copyright (C) 2006-2007 Rivo Laks <rivolaks at hot.ee>
+    Copyright (C) 2007,2008 Alex Merry <alex.merry at kdemail.net>
+    Copyright (C) 2007, 2008 Petri Damsten <damu at iki.fi>
+    Copyright (C) 2007, 2008 Rob Scheepmaker <r.scheepmaker at student.utwente.nl>
+    Copyright (C) 2007-2008 Shawn Starr <shawn.starr at rogers.com>
+    Copyright (C) 2007 Alexis Ménard <darktears31 at gmail.com>
+    Copyright (C) 2007 André Duffeck <duffeck at kde.org>
+    Copyright (C) 2007-2008 Anne-Marie Mahfouf <annma at kde.org>
+    Copyright (C) 2007 Antonio Vinci <mercurio at personellarete.it>
+    Copyright (C) 2007-2008 Artur Duque de Souza <morpheuz at gmail.com>
     Copyright (C) 2007 Brad Hards <bradh at frogmouth.net>
     Copyright (C) 2007 Chani Armitage <chanika at gmail.com>
     Copyright (C) 2007-2008 Davide Bettio <davide.bettio at kdemail.net>
@@ -35,7 +35,7 @@ Upstream Authors and copyright holders:
     Copyright (C) 2007-2008 Sebastian Kuegler <sebas at kde.org>
     Copyright (C) 2007 Sven Burmeister <sven.burmeister at gmx.net>
     Copyright (C) 2007 Teemu Rytilahti <tpr at iki.fi>
-    Copyright (C) 2007 Thomas Georgiou <TAGeorgiou at gmail.com> 
+    Copyright (C) 2007 Thomas Georgiou <TAGeorgiou at gmail.com>
     Copyright (C) 2007 Jeff Cooper <weirdsox11 at gmail.com>
     Copyright (C) 2007 Tobias Koenig <tokoe at kde.org>
     Copyright (C) 2007 Trever Fischer <wm161 at wm161.net>
@@ -71,7 +71,7 @@ applets/rssnow/ is a mix of LGPLv2 or later and GPLv2 or later.
 
 
 applets/lancelot/ Lancelot is almost entirely gplv2 or later, but at least
-                  some files is under lgplv2 or later (especially the lib/ dir), so entire 
+                  some files is under lgplv2 or later (especially the lib/ dir), so entire
 		  lancelot is gplv2 or later as well.
 
 
@@ -89,33 +89,33 @@ runners/spellchecker: mix of lgplv2 or later and gplv2 or later => gpl v2 or lat
 
 GPLv2:
 
-    This program is free software; you can redistribute it and/or modify 
-    it under the terms of the GNU General Public License as published by  
-    the Free Software Foundation; either version 2 of the License, or     
-    (at your option) any later version.                                   
-                                                                          
-    This program is distributed in the hope that it will be useful,       
-    but WITHOUT ANY WARRANTY; without even the implied warranty of        
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         
-    GNU General Public License for more details.                          
-                                                                          
-    You should have received a copy of the GNU General Public License     
-    along with this program; if not, write to the                         
-    Free Software Foundation, Inc.,                                       
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        
-	
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the
+    Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .
+
 
 LGPLv2:
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU Lesser/Library General Public License version 2,
     or (at your option) any later version, as published by the Free
     Software Foundation
- 
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU Lesser/Library General Public License for more details
- 
+
     You should have received a copy of the GNU Lesser/Library General Public
     License along with this program; if not, write to the
     Free Software Foundation, Inc.,
diff --git a/debian/not-installed b/debian/not-installed
index f437e57..9670908 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -5,31 +5,9 @@
 ./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
-./usr/include/lancelot/Global.h
-./usr/include/lancelot/lancelot.h
-./usr/include/lancelot/lancelot_export.h
-./usr/include/lancelot/layouts/CardLayout.h
-./usr/include/lancelot/layouts/ColumnLayout.h
-./usr/include/lancelot/models/ActionListModel.h
-./usr/include/lancelot/models/ActionTreeModel.h
-./usr/include/lancelot/models/ActionTreeModelProxy.h
-./usr/include/lancelot/models/MergedActionListModel.h
-./usr/include/lancelot/models/PlasmaServiceListModel.h
-./usr/include/lancelot/models/StandardActionListModel.h
-./usr/include/lancelot/models/StandardActionTreeModel.h
-./usr/include/lancelot/widgets/ActionListView.h
-./usr/include/lancelot/widgets/BasicWidget.h
-./usr/include/lancelot/widgets/ExtenderButton.h
-./usr/include/lancelot/widgets/HoverIcon.h
-./usr/include/lancelot/widgets/Panel.h
-./usr/include/lancelot/widgets/PassagewayView.h
-./usr/include/lancelot/widgets/PopupList.h
-./usr/include/lancelot/widgets/PopupMenu.h
-./usr/include/lancelot/widgets/ResizeBordersPanel.h
-./usr/include/lancelot/widgets/Widget.h
-./usr/lib/liblancelot.so
 ./usr/include/KDE/Lancelot/ActionListModel
 ./usr/include/KDE/Lancelot/ActionListView
 ./usr/include/KDE/Lancelot/ActionTreeModel
@@ -44,8 +22,6 @@
 ./usr/include/KDE/Lancelot/Global
 ./usr/include/KDE/Lancelot/HoverIcon
 ./usr/include/KDE/Lancelot/Lancelot
-./usr/include/KDE/Lancelot/LancelotTestApplication
-./usr/include/KDE/Lancelot/LancelotTestWindow
 ./usr/include/KDE/Lancelot/MergedActionListModel
 ./usr/include/KDE/Lancelot/Models/Applications
 ./usr/include/KDE/Lancelot/Models/AvailableModels
@@ -98,13 +74,36 @@
 ./usr/include/lancelot-datamodels/SystemActions.h
 ./usr/include/lancelot-datamodels/SystemServices.h
 ./usr/include/lancelot-datamodels/XbelModel.h
+./usr/include/lancelot/Global.h
+./usr/include/lancelot/lancelot.h
+./usr/include/lancelot/lancelot_export.h
+./usr/include/lancelot/layouts/CardLayout.h
+./usr/include/lancelot/layouts/ColumnLayout.h
 ./usr/include/lancelot/layouts/FlipLayout.h
 ./usr/include/lancelot/layouts/FullBorderLayout.h
 ./usr/include/lancelot/layouts/NodeLayout.h
-./usr/include/lancelot/widgets/TabBar.h
+./usr/include/lancelot/models/ActionListModel.h
+./usr/include/lancelot/models/ActionTreeModel.h
+./usr/include/lancelot/models/ActionTreeModelProxy.h
+./usr/include/lancelot/models/MergedActionListModel.h
+./usr/include/lancelot/models/PlasmaServiceListModel.h
+./usr/include/lancelot/models/StandardActionListModel.h
+./usr/include/lancelot/models/StandardActionTreeModel.h
+./usr/include/lancelot/widgets/ActionListView.h
+./usr/include/lancelot/widgets/BasicWidget.h
 ./usr/include/lancelot/widgets/CustomListView.h
+./usr/include/lancelot/widgets/ExtenderButton.h
+./usr/include/lancelot/widgets/HoverIcon.h
+./usr/include/lancelot/widgets/Panel.h
+./usr/include/lancelot/widgets/PassagewayView.h
+./usr/include/lancelot/widgets/PopupList.h
+./usr/include/lancelot/widgets/PopupMenu.h
+./usr/include/lancelot/widgets/ResizeBordersPanel.h
 ./usr/include/lancelot/widgets/ScrollBar.h
 ./usr/include/lancelot/widgets/ScrollPane.h
+./usr/include/lancelot/widgets/TabBar.h
+./usr/include/lancelot/widgets/Widget.h
 ./usr/lib/liblancelot-datamodels.so
-./usr/share/kde4/apps/cmake/modules/FindLancelot.cmake
+./usr/lib/liblancelot.so
 ./usr/share/kde4/apps/cmake/modules/FindLancelot-Datamodels.cmake
+./usr/share/kde4/apps/cmake/modules/FindLancelot.cmake
diff --git a/debian/plasma-containments-addons.install b/debian/plasma-containments-addons.install
index a13668e..5fa806f 100644
--- a/debian/plasma-containments-addons.install
+++ b/debian/plasma-containments-addons.install
@@ -1,9 +1,8 @@
-usr/share/kde4/services/plasma-containment-groupingdesktop.desktop
-usr/share/kde4/services/plasma-containment-groupingpanel.desktop
-usr/share/kde4/services/plasma-containment-griddesktop.desktop
-usr/lib/libplasma_groupingcontainment.so
-usr/lib/libplasma_groupingcontainment.so.4
-usr/lib/libplasma_groupingcontainment.so.4.6.0
-usr/lib/kde4/plasma_containment_groupingpanel.so
 usr/lib/kde4/plasma_containment_griddesktop.so
 usr/lib/kde4/plasma_containment_groupingdesktop.so
+usr/lib/kde4/plasma_containment_groupingpanel.so
+usr/lib/libplasma_groupingcontainment.so.4
+usr/lib/libplasma_groupingcontainment.so.4.6.0
+usr/share/kde4/services/plasma-containment-griddesktop.desktop
+usr/share/kde4/services/plasma-containment-groupingdesktop.desktop
+usr/share/kde4/services/plasma-containment-groupingpanel.desktop
diff --git a/debian/plasma-containments-addons.lintian-overrides b/debian/plasma-containments-addons.lintian-overrides
new file mode 100644
index 0000000..9228dc0
--- /dev/null
+++ b/debian/plasma-containments-addons.lintian-overrides
@@ -0,0 +1 @@
+plasma-containments-addons: package-name-doesnt-match-sonames libplasma-groupingcontainment4
diff --git a/debian/plasma-runners-addons.install b/debian/plasma-runners-addons.install
index 252ac5f..0239178 100644
--- a/debian/plasma-runners-addons.install
+++ b/debian/plasma-runners-addons.install
@@ -1,6 +1,7 @@
 usr/lib/kde4/kcm_krunner_audioplayercontrol.so
 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_browserhistory.so
 usr/lib/kde4/krunner_charrunner.so
@@ -13,6 +14,7 @@ usr/lib/kde4/krunner_kopete.so
 usr/lib/kde4/krunner_mediawiki.so
 usr/lib/kde4/krunner_spellcheckrunner.so
 usr/lib/kde4/plasma_runner_datetime.so
+usr/lib/kde4/plasma_runner_events.so
 usr/share/kde4/services/CharRunner_config.desktop
 usr/share/kde4/services/CharacterRunner.desktop
 usr/share/kde4/services/browserhistory.desktop
@@ -24,13 +26,11 @@ usr/share/kde4/services/plasma-runner-audioplayercontrol_config.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
+usr/share/kde4/services/plasma-runner-events.desktop
+usr/share/kde4/services/plasma-runner-events_config.desktop
 usr/share/kde4/services/plasma-runner-kopete.desktop
 usr/share/kde4/services/plasma-runner-spellchecker.desktop
 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-events.desktop
-usr/lib/kde4/plasma_runner_events.so
-usr/lib/kde4/kcm_plasma_runner_events.so
-usr/share/kde4/services/plasma-runner-events_config.desktop
diff --git a/debian/plasma-widget-kimpanel-backend-ibus.install b/debian/plasma-widget-kimpanel-backend-ibus.install
new file mode 100644
index 0000000..c702f0d
--- /dev/null
+++ b/debian/plasma-widget-kimpanel-backend-ibus.install
@@ -0,0 +1,2 @@
+/usr/lib/ibus/ibus-ui-kde
+debian/xinput/ibus-kde /etc/X11/xinit/xinput.d/
diff --git a/debian/plasma-widget-kimpanel-backend-scim.install b/debian/plasma-widget-kimpanel-backend-scim.install
deleted file mode 100644
index df4b0bc..0000000
--- a/debian/plasma-widget-kimpanel-backend-scim.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/scim-1.0/scim-panel-dbus
diff --git a/debian/plasma-widget-kimpanel.install b/debian/plasma-widget-kimpanel.install
index 8afd64c..af9b04c 100644
--- a/debian/plasma-widget-kimpanel.install
+++ b/debian/plasma-widget-kimpanel.install
@@ -1,8 +1,6 @@
 usr/bin/kimpanel
 usr/lib/kde4/plasma_applet_kimpanel.so
-usr/lib/libkimpanelruntime.so
 usr/lib/libkimpanelruntime.so.0
-usr/share/dbus-1/interfaces/org.kde.impanel.xml
 usr/share/kde4/config.kcfg/kimpanelconfig.kcfg
 usr/share/kde4/services/plasma-applet-kimpanel.desktop
 
diff --git a/debian/plasma-widget-lancelot.install b/debian/plasma-widget-lancelot.install
index 3e65198..171354c 100644
--- a/debian/plasma-widget-lancelot.install
+++ b/debian/plasma-widget-lancelot.install
@@ -3,8 +3,8 @@ usr/lib/kde4/plasma_applet_lancelot_launcher.so
 usr/lib/kde4/plasma_applet_lancelot_part.so
 usr/lib/liblancelot-datamodels.so.1
 usr/lib/liblancelot-datamodels.so.1.7.0
-usr/lib/liblancelot.so.2
 usr/lib/liblancelot.so.1.9.0
+usr/lib/liblancelot.so.2
 usr/share/icons/hicolor/128x128/apps/lancelot-start.png
 usr/share/icons/hicolor/128x128/apps/lancelot.png
 usr/share/icons/hicolor/128x128/apps/plasmaapplet-shelf.png
@@ -74,7 +74,7 @@ usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/system-buttons-extender.svgz
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/system-buttons.svgz
 usr/share/kde4/apps/desktoptheme/slim-glow/lancelot/theme.config
 usr/share/kde4/apps/lancelot/lancelot.notifyrc
+usr/share/kde4/services/lancelot.desktop
 usr/share/kde4/services/plasma-applet-lancelot-launcher.desktop
 usr/share/kde4/services/plasma-applet-lancelot-part.desktop
 usr/share/mime/packages/lancelotpart-mime.xml
-usr/share/kde4/services/lancelot.desktop
diff --git a/debian/plasma-widget-lancelot.lintian-overrides b/debian/plasma-widget-lancelot.lintian-overrides
index 0a6795c..0c8a324 100644
--- a/debian/plasma-widget-lancelot.lintian-overrides
+++ b/debian/plasma-widget-lancelot.lintian-overrides
@@ -1 +1 @@
-plasma-widget-lancelot: package-name-doesnt-match-sonames liblancelot-datamodels0 liblancelot1
+plasma-widget-lancelot: package-name-doesnt-match-sonames liblancelot-datamodels1 liblancelot2
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index 416b65b..1f11a16 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -45,22 +45,40 @@ usr/lib/kde4/plasma_applet_weather.so
 usr/lib/kde4/plasma_applet_weatherstation.so
 usr/lib/kde4/plasma_applet_webslice.so
 usr/share/icons/hicolor/128x128/apps/bball.png
+usr/share/icons/hicolor/128x128/apps/eyes.png
+usr/share/icons/hicolor/128x128/apps/lifegame.png
+usr/share/icons/hicolor/128x128/apps/luna.png
 usr/share/icons/hicolor/128x128/apps/previewer.png
+usr/share/icons/hicolor/128x128/apps/qalculate-applet.png
 usr/share/icons/hicolor/16x16/apps/bball.png
+usr/share/icons/hicolor/16x16/apps/eyes.png
+usr/share/icons/hicolor/16x16/apps/lifegame.png
+usr/share/icons/hicolor/16x16/apps/luna.png
 usr/share/icons/hicolor/16x16/apps/previewer.png
+usr/share/icons/hicolor/22x22/apps/eyes.png
+usr/share/icons/hicolor/22x22/apps/lifegame.png
+usr/share/icons/hicolor/22x22/apps/luna.png
 usr/share/icons/hicolor/22x22/apps/previewer.png
+usr/share/icons/hicolor/256x256/apps/eyes.png
+usr/share/icons/hicolor/256x256/apps/lifegame.png
 usr/share/icons/hicolor/32x32/apps/bball.png
+usr/share/icons/hicolor/32x32/apps/eyes.png
+usr/share/icons/hicolor/32x32/apps/lifegame.png
+usr/share/icons/hicolor/32x32/apps/luna.png
 usr/share/icons/hicolor/32x32/apps/previewer.png
 usr/share/icons/hicolor/48x48/apps/bball.png
+usr/share/icons/hicolor/48x48/apps/lifegame.png
+usr/share/icons/hicolor/48x48/apps/luna.png
 usr/share/icons/hicolor/48x48/apps/previewer.png
 usr/share/icons/hicolor/48x48/apps/qalculate-applet.png
 usr/share/icons/hicolor/64x64/apps/bball.png
+usr/share/icons/hicolor/64x64/apps/lifegame.png
+usr/share/icons/hicolor/64x64/apps/luna.png
 usr/share/icons/hicolor/64x64/apps/previewer.png
-usr/share/icons/hicolor/128x128/apps/qalculate-applet.png
 usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 usr/share/icons/hicolor/scalable/apps/bball.svgz
-usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
 usr/share/icons/hicolor/scalable/apps/eyes.svgz
+usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
 usr/share/icons/hicolor/scalable/apps/lifegame.svgz
 usr/share/kde4/apps/bball/bball.svgz
 usr/share/kde4/apps/bball/bounce.ogg
@@ -93,6 +111,7 @@ usr/share/kde4/apps/plasmaboard/mid.xml
 usr/share/kde4/apps/plasmaboard/tablet.xml
 usr/share/kde4/apps/rssnow/feeds
 usr/share/kde4/config/comic.knsrc
+usr/share/kde4/config/pastebin.knsrc
 usr/share/kde4/services/ServiceMenus/preview.desktop
 usr/share/kde4/services/plasma-applet-bball.desktop
 usr/share/kde4/services/plasma-applet-binaryclock.desktop
@@ -140,22 +159,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/share/kde4/config/pastebin.knsrc
-usr/share/icons/hicolor/128x128/apps/eyes.png
-usr/share/icons/hicolor/128x128/apps/lifegame.png
-usr/share/icons/hicolor/128x128/apps/luna.png
-usr/share/icons/hicolor/64x64/apps/lifegame.png
-usr/share/icons/hicolor/64x64/apps/luna.png
-usr/share/icons/hicolor/48x48/apps/lifegame.png
-usr/share/icons/hicolor/48x48/apps/luna.png
-usr/share/icons/hicolor/256x256/apps/eyes.png
-usr/share/icons/hicolor/256x256/apps/lifegame.png
-usr/share/icons/hicolor/22x22/apps/eyes.png
-usr/share/icons/hicolor/22x22/apps/lifegame.png
-usr/share/icons/hicolor/22x22/apps/luna.png
-usr/share/icons/hicolor/16x16/apps/eyes.png
-usr/share/icons/hicolor/16x16/apps/lifegame.png
-usr/share/icons/hicolor/16x16/apps/luna.png
-usr/share/icons/hicolor/32x32/apps/eyes.png
-usr/share/icons/hicolor/32x32/apps/lifegame.png
-usr/share/icons/hicolor/32x32/apps/luna.png
diff --git a/debian/rules b/debian/rules
index b838e88..849dcd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-DEB_DH_MAKESHLIBS_ARGS_liblancelot0 := -V -u-c0
+.PHONY: override_dh_auto_test
 
-install/plasma-widget-kimpanel-backend-ibus::
-	mkdir -p $(CURDIR)/debian/plasma-widget-kimpanel-backend-ibus/usr/lib/ibus/
+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/plasma-widget-kimpanel-backend-ibus/usr/lib/ibus/ibus-ui-kde
-	mkdir -p $(CURDIR)/debian/plasma-widget-kimpanel-backend-ibus/etc/X11/xinit/xinput.d/
-	cp $(CURDIR)/debian/xinput/ibus-kde \
-		$(CURDIR)/debian/plasma-widget-kimpanel-backend-ibus/etc/X11/xinit/xinput.d/
-clean::
+		$(CURDIR)/debian/tmp/usr/lib/ibus/ibus-ui-kde
+	$(overridden_command)
+
+override_auto_clean:
+	$(overridden_command)
 	find applets/lancelot/tools/puck -name *.pyc -delete

-- 
KDE Plasma Addons module packaging



More information about the pkg-kde-commits mailing list