KDE Artwork

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

  1. 4.5.95_2
  2. Merge into kdeartwork
Proposed by Philip Muškovac
Status: Merged
Merged at revision: 99
Proposed branch: lp:~yofel/kdeartwork/4.5.95_2
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork
Diff against target: 31 lines (+7/-3)
2 files modified
debian/changelog (+6/-2)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~yofel/kdeartwork/4.5.95_2
Reviewer Review Type Date Requested Status
Kubuntu Members Pending
Review via email: mp+45415@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-01-05 19:02:24 +0000
3+++ debian/changelog 2011-01-06 16:52:42 +0000
4@@ -1,8 +1,12 @@
5-kdeartwork (4:4.5.95-0ubuntu1~ppa1) natty; urgency=low
6+kdeartwork (4:4.5.95-0ubuntu1~ppa2) natty; urgency=low
7
8+ [ Jonathan Riddell ]
9 * New upstream release
10
11- -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 05 Jan 2011 17:34:20 +0000
12+ [ Philip Muskovac ]
13+ * kdewallpapers replaces kdebase-workspace-wallpapers (<< 4:4.5.95)
14+
15+ -- Philip Muskovac <yofel@gmx.net> Thu, 06 Jan 2011 17:20:29 +0100
16
17 kdeartwork (4:4.5.90-0ubuntu1) natty; urgency=low
18
19
20=== modified file 'debian/control'
21--- debian/control 2010-12-23 13:45:07 +0000
22+++ debian/control 2011-01-06 16:52:42 +0000
23@@ -49,7 +49,7 @@
24 Depends: ${misc:Depends}
25 Section: kde
26 Suggests: kde-window-manager | x-window-manager
27-Replaces: kdebase-workspace-data (<< 4:4.5.0), kdebase-workspace-wallpapers (<< 4:4.4.90)
28+Replaces: kdebase-workspace-data (<< 4:4.5.0), kdebase-workspace-wallpapers (<< 4:4.5.95)
29 Description: wallpapers released with KDE Plasma Workspaces
30 This package contains additional wallpapers for KDE Plasma Workspaces.
31 .

Subscribers

People subscribed via source and target branches

to all changes: