[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=7f4ede4

The following commit has been merged in the master branch:
commit 7f4ede45bdb15a031185eb65b1c80cda7d3bd4cf
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Dec 18 10:04:03 2008 -0500

    4.1.85-0ubuntu2 update
---
 debian/changelog | 10 ++++++++++
 debian/control   | 31 +++----------------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c00153c..c2dd5f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kdeplasma-addons (4:4.1.85-0ubuntu2) jaunty; urgency=low
+
+  * Drop no longer needed transitional packages
+    - kdeplasmoids
+    - kdeplasmoids-data
+    - kdeplasmoids-dbg
+  * Add kdeplasma-addons replaces kdeplasmoids and not just conflicts
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 17 Dec 2008 13:38:10 -0500
+
 kdeplasma-addons (4:4.1.85-0ubuntu1) jaunty; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 4186b52..ce839a1 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdeplasma-addons-data (= ${source:Version})
 Replaces: kdebase-workspace-bin (<< 4:4.0.0), extragear-plasma,
- plasmoid-lancelot, plasmoid-previewer
+ plasmoid-lancelot, plasmoid-previewer, kdeplasmoids
 Conflicts: extragear-plasma, kdeplasmoids, plasmoid-lancelot,
  plasmoid-previewer
 Description: plasmoids for KDE 4 Plasma - main package
@@ -29,19 +29,11 @@ Description: plasmoids for KDE 4 Plasma - main package
  This package contains Plasma data engines and widgets (applets). Install
  this package if you want to use plasmoids from the KDE Plasmoids module.
 
-Package: kdeplasmoids
-Architecture: all
-Priority: extra
-Depends: kdeplasma-addons
-Description: Transitional package
- This dummy package is provided for a smooth transition from kdeplasmoids to
- the new version, named kdeplasma-addons.
- It may safely be removed after installation.
-
 Package: kdeplasma-addons-data
 Architecture: all
 Section: kde
-Replaces: extragear-plasma-data, plasmoid-lancelot, plasmoid-previewer
+Replaces: extragear-plasma-data, kdeplasmoids-data, plasmoid-lancelot,
+ plasmoid-previewer
 Conflicts: extragear-plasma-data, kdeplasmoids-data, plasmoid-lancelot,
  plasmoid-previewer
 Description: plasmoids for KDE 4 Plasma - data files
@@ -51,15 +43,6 @@ Description: plasmoids for KDE 4 Plasma - data files
  This package contains the architecture-independent data files needed by
  kdeplasma-addons.
 
-Package: kdeplasmoids-data
-Architecture: all
-Priority: extra
-Depends: kdeplasma-addons-data
-Description: Transitional package
- This dummy package is provided for a smooth transition from kdeplasmoids to
- the new version, named kdeplasma-addons.
- It may safely be removed after installation.
-
 Package: kdeplasma-addons-dbg
 Section: libdevel
 Architecture: any
@@ -72,11 +55,3 @@ Description: debugging symbols for kdeplasmoids
  They will automatically be used by gdb for debugging kdeplasma-addons related
  issues.
 
-Package: kdeplasmoids-dbg
-Architecture: all
-Priority: extra
-Depends: kdeplasma-addons-dbg
-Description: Transitional package
- This dummy package is provided for a smooth transition from kdeplasmoids to
- the new version, named kdeplasma-addons.
- It may safely be removed after installation.

-- 
KDE Plasma Addons module packaging