Merge lp:~yofel/kdeartwork/4.5.95_2 into lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork

[Philip Muškovac]

fix
dpkg: error processing /var/cache/apt/archives/kdewallpapers_4%3a4.5.95-0ubuntu1~ppa1_all.deb (--unpack):
 trying to overwrite '/usr/share/wallpapers/Ethais/metadata.desktop', which is also in package kdebase-workspace-wallpapers 4:4.5.90-0ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-05 19:02:24 +0000
+++ debian/changelog	2011-01-06 16:52:42 +0000
@@ -1,8 +1,12 @@
-kdeartwork (4:4.5.95-0ubuntu1~ppa1) natty; urgency=low
+kdeartwork (4:4.5.95-0ubuntu1~ppa2) natty; urgency=low
 
+  [ Jonathan Riddell ]
   * New upstream release
 
- -- Jonathan Riddell <[e-mail]>  Wed, 05 Jan 2011 17:34:20 +0000
+  [ Philip Muskovac ]
+  * kdewallpapers replaces kdebase-workspace-wallpapers (<< 4:4.5.95)
+
+ -- Philip Muskovac <[e-mail]>  Thu, 06 Jan 2011 17:20:29 +0100
 
 kdeartwork (4:4.5.90-0ubuntu1) natty; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2010-12-23 13:45:07 +0000
+++ debian/control	2011-01-06 16:52:42 +0000
@@ -49,7 +49,7 @@
 Depends: ${misc:Depends}
 Section: kde
 Suggests: kde-window-manager | x-window-manager
-Replaces: kdebase-workspace-data (<< 4:4.5.0), kdebase-workspace-wallpapers (<< 4:4.4.90)
+Replaces: kdebase-workspace-data (<< 4:4.5.0), kdebase-workspace-wallpapers (<< 4:4.5.95)
 Description: wallpapers released with KDE Plasma Workspaces
  This package contains additional wallpapers for KDE Plasma Workspaces.
  .