Merge lp:~yofel/kdeartwork/4.5.80ubuntu4 into lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork

[Philip Muškovac]

Fixes:

Selecting previously deselected package kdeartwork-theme-window.
Unpacking kdeartwork-theme-window (from .../kdeartwork-theme-window_4%3a4.5.80-0ubuntu3~maverick1~ppa1_amd64.deb) ...
dpkg: error processing /var/cache/apt/archives/kdeartwork-theme-window_4%3a4.5.80-0ubuntu3~maverick1~ppa1_amd64.deb (--unpack):
 trying to overwrite '/usr/share/kde4/apps/aurorae/themes/Air-Oxygen/decoration.svgz', which is also in package aurorae-themes-artwork 4:4.5.3-0ubuntu1~maverick1~ppa1

I removed the version since the package doesn't exist in 4.5.80 anymore

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-30 18:33:14 +0000
+++ debian/changelog	2010-12-01 16:04:28 +0000
@@ -1,3 +1,9 @@
+kdeartwork (4:4.5.80-0ubuntu4) natty; urgency=low
+
+  * kdeartwork-theme-window replaces aurorae-themes-artwork
+
+ -- Philip Muskovac <[e-mail]>  Wed, 01 Dec 2010 16:41:36 +0100
+
 kdeartwork (4:4.5.80-0ubuntu3) natty; urgency=low
 
   [ Philip Muskovac ]
 
=== modified file 'debian/control'
--- debian/control	2010-11-30 18:33:14 +0000
+++ debian/control	2010-12-01 16:04:28 +0000
@@ -88,8 +88,8 @@
 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
+Conflicts: aurorae-themes-artwork
 Section: kde
 Description: window decoration for the K Window manager (KWin)
  This package contains additional window decorations for K Window Manager