Merge lp:~yofel/kdeartwork/4580u2 into lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork

[Philip Muškovac]

Fix overwrite errors.

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-25 18:13:34 +0000
+++ debian/changelog	2010-11-28 16:14:57 +0000
@@ -1,3 +1,10 @@
+kdeartwork (4:4.5.80-0ubuntu2) natty; urgency=low
+
+  * kdeartwork-dbg conflicts/replaces kdebase-workspace-dbg (<< 4:4.5.80)
+  * kdeartwork-theme-window conflicts/replaces kde-window-manager (<< 4:4.5.80)
+
+ -- Philip Muskovac <[e-mail]>  Sun, 28 Nov 2010 16:51:09 +0100
+
 kdeartwork (4:4.5.80-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream beta release

=== modified file 'debian/control'
--- debian/control	2010-11-25 18:13:34 +0000
+++ debian/control	2010-11-28 16:14:57 +0000
@@ -88,8 +88,10 @@
 Package: kdeartwork-theme-window
 Architecture: any
 Depends: ${misc:Depends}
-Replaces: aurorae-themes-artwork (<= 4:4.5.2-1ubuntu1)
-Conflicts: aurorae-themes-artwork (<= 4:4.5.2-1ubuntu1)
+Replaces: aurorae-themes-artwork (<= 4:4.5.2-1ubuntu1),
+ kde-window-manager (<< 4:4.5.80)
+Conflicts: aurorae-themes-artwork (<= 4:4.5.2-1ubuntu1),
+ kde-window-manager (<< 4:4.5.80)
 Section: kde
 Description: window decoration for the K Window manager (KWin)
  This package contains additional window decorations for K Window Manager
@@ -177,6 +179,8 @@
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: kdeartwork (= ${source:Version})
+Replaces: kdebase-workspace-dbg (<< 4:4.5.80)
+Conflicts: kdebase-workspace-dbg (<< 4:4.5.80)
 Description: debugging symbols for kdeartwork
  This package contains the debugging files associated with kdeartwork.
  They will automatically be used by gdb for debugging kdeartwork-related