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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 60830a5cfd02704119b94fe4226f6a1b65793f79
Author: Philip Muskovac <yofel at gmx.net>
Date:   Sat May 25 00:24:04 2013 +0200

    * plasma-widgets-addons breaks/replaces
      plasma-runners-addons << 4:4.10.3-0ubuntu2~,
      plasma-widget-kimpanel << 4:4.10.3-0ubuntu2~,
      plasma-wallpapers-addons << 4:4.10.3-0ubuntu2~
    * plasma-dataengines-addons breaks/replaces
      plasma-widget-kdeobservatory << 4:4.10.3-0ubuntu2~
    * Remove files from plasma-widget-kdeobservatory.install that conflict with
      plasma-dataengines-addons
---
 debian/changelog                            | 16 +++++++++++++++-
 debian/control                              |  8 ++++++++
 debian/plasma-widget-kdeobservatory.install |  3 ---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de11935..8f08b62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,24 @@
+kdeplasma-addons (4:4.10.3-0ubuntu2) saucy; urgency=low
+
+  * plasma-widgets-addons breaks/replaces
+    plasma-runners-addons << 4:4.10.3-0ubuntu2~,
+    plasma-widget-kimpanel << 4:4.10.3-0ubuntu2~,
+    plasma-wallpapers-addons << 4:4.10.3-0ubuntu2~
+  * plasma-dataengines-addons breaks/replaces
+    plasma-widget-kdeobservatory << 4:4.10.3-0ubuntu2~
+  * Remove files from plasma-widget-kdeobservatory.install that conflict with
+    plasma-dataengines-addons
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sat, 25 May 2013 00:21:09 +0200
+
 kdeplasma-addons (4:4.10.3-0ubuntu1) saucy; urgency=low
 
   * Merged with Debian, remaining changes:
    - Build plasma-widget-kdeobservatory
    - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
      kde-wallpapers
-   - plasma-widgets-addons suggests plasma-widget-lancelot instead of       recommends (we don't want that since CD size is limited) 
+   - plasma-widgets-addons suggests plasma-widget-lancelot instead of
+     recommends (we don't want that since CD size is limited) 
    - Do not build against libscim-dev - we use IBus
    - Add build-dep on libqwt-dev, libglib2.0-dev, shared-mime-info
    - Kept kubuntu_01_news_applet_name.diff
diff --git a/debian/control b/debian/control
index d607cdc..92cbc11 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,12 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
  plasma-dataengines-addons (= ${binary:Version}),
+Breaks: plasma-runners-addons (<< 4:4.10.3-0ubuntu2~),
+ plasma-widget-kimpanel (<< 4:4.10.3-0ubuntu2~),
+ plasma-wallpapers-addons (<< 4:4.10.3-0ubuntu2~)
+Replaces: plasma-runners-addons (<< 4:4.10.3-0ubuntu2~),
+ plasma-widget-kimpanel (<< 4:4.10.3-0ubuntu2~),
+ plasma-wallpapers-addons (<< 4:4.10.3-0ubuntu2~)
 Suggests: plasma-widget-kimpanel, plasma-widget-lancelot
 Description: additional widgets for Plasma
  This package contains additional Plasma widgets shipped in the Plasma
@@ -121,6 +127,8 @@ Package: plasma-dataengines-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: plasma-widget-kdeobservatory (<< 4:4.10.3-0ubuntu2~)
+Replaces: plasma-widget-kdeobservatory (<< 4:4.10.3-0ubuntu2~)
 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 widget shipped with
diff --git a/debian/plasma-widget-kdeobservatory.install b/debian/plasma-widget-kdeobservatory.install
index 391560d..35393c4 100644
--- a/debian/plasma-widget-kdeobservatory.install
+++ b/debian/plasma-widget-kdeobservatory.install
@@ -1,5 +1,4 @@
 usr/lib/kde4/plasma_applet_kdeobservatory.so
-usr/lib/kde4/plasma_engine_kdeobservatory.so
 usr/share/icons/hicolor/128x128/apps/kdeobservatory.png
 usr/share/icons/hicolor/16x16/apps/kdeobservatory.png
 usr/share/icons/hicolor/22x22/apps/kdeobservatory.png
@@ -7,6 +6,4 @@ usr/share/icons/hicolor/32x32/apps/kdeobservatory.png
 usr/share/icons/hicolor/48x48/apps/kdeobservatory.png
 usr/share/icons/hicolor/64x64/apps/kdeobservatory.png
 usr/share/icons/hicolor/scalable/apps/kdeobservatory.svgz
-usr/share/kde4/apps/plasma/services/kdeobservatory.operations
 usr/share/kde4/services/plasma-applet-kdeobservatory.desktop
-usr/share/kde4/services/plasma-engine-kdeobservatory.desktop

-- 
KDE Plasma Addons module packaging