[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=0b2304e

The following commit has been merged in the master branch:
commit 0b2304e1621ccddf672348cf7924a4e61905806a
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Wed Jan 25 13:01:42 2012 +0000

    really remove kdeobservatory files from other packages
---
 debian/changelog                         | 7 +++++--
 debian/control                           | 6 ++++--
 debian/plasma-dataengines-addons.install | 3 ---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9400752..40829ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-kdeplasma-addons (4:4.8.0-0ubuntu1~ppa1) precise; urgency=low
+kdeplasma-addons (4:4.8.0-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release
+  * really remove kdeobservatory files from other packages
+  * plasma-widgets-addons replaces/breaks plasma-engine-kdeobservatory
+  * plasma-engine-kdeobservatory replaces/breaks old plasma-widgets-addons
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2012 12:10:23 +0000
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Jan 2012 12:47:23 +0000
 
 kdeplasma-addons (4:4.7.97-0ubuntu1) precise; urgency=low
 
diff --git a/debian/control b/debian/control
index 4ce0fe2..5a46254 100644
--- a/debian/control
+++ b/debian/control
@@ -43,8 +43,8 @@ Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
  plasma-dataengines-addons (= ${binary:Version}),
 Suggests: plasma-widget-lancelot
-Replaces: plasma-widget-system-status
-Breaks: plasma-widget-system-status
+Replaces: plasma-widget-system-status, plasma-engine-kdeobservatory (<< 4.8.0)
+Breaks: plasma-widget-system-status, plasma-engine-kdeobservatory (<< 4.8.0)
 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
@@ -135,6 +135,8 @@ Package: plasma-widget-kdeobservatory
 Architecture: any
 Section: kde
 Depends: ${shlibs: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
  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
diff --git a/debian/plasma-dataengines-addons.install b/debian/plasma-dataengines-addons.install
index c7dd623..97930c9 100644
--- a/debian/plasma-dataengines-addons.install
+++ b/debian/plasma-dataengines-addons.install
@@ -1,6 +1,5 @@
 usr/lib/kde4/plasma_comic_krossprovider.so
 usr/lib/kde4/plasma_engine_comic.so
-usr/lib/kde4/plasma_engine_kdeobservatory.so
 usr/lib/kde4/plasma_engine_microblog.so
 usr/lib/kde4/plasma_engine_ocs.so
 usr/lib/kde4/plasma_engine_potd.so
@@ -19,7 +18,6 @@ usr/lib/libplasmaweather.so.4
 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/kdeobservatory.operations
 usr/share/kde4/apps/plasma/services/ocsPerson.operations
 usr/share/kde4/apps/plasma/services/rtmauth.operations
 usr/share/kde4/apps/plasma/services/rtmtask.operations
@@ -34,7 +32,6 @@ usr/share/kde4/services/plasma-dataengine-comic.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
-usr/share/kde4/services/plasma-engine-kdeobservatory.desktop
 usr/share/kde4/services/plasma-engine-rtm.desktop
 usr/share/kde4/services/plasma-packagestructure-comic.desktop
 usr/share/kde4/services/wcpotdprovider.desktop

-- 
KDE Plasma Addons module packaging