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

Proposed by Philip Muškovac
Status: Merged
Merged at revision: 91
Proposed branch: lp:~yofel/kdeartwork/4.5.80ubuntu4
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork
Diff against target: 28 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~yofel/kdeartwork/4.5.80ubuntu4
Reviewer Review Type Date Requested Status
Kubuntu Members Pending
Review via email: mp+42384@code.launchpad.net

Description of the change

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

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 2010-11-30 18:33:14 +0000
3+++ debian/changelog 2010-12-01 16:04:28 +0000
4@@ -1,3 +1,9 @@
5+kdeartwork (4:4.5.80-0ubuntu4) natty; urgency=low
6+
7+ * kdeartwork-theme-window replaces aurorae-themes-artwork
8+
9+ -- Philip Muskovac <yofel@gmx.net> Wed, 01 Dec 2010 16:41:36 +0100
10+
11 kdeartwork (4:4.5.80-0ubuntu3) natty; urgency=low
12
13 [ Philip Muskovac ]
14
15=== modified file 'debian/control'
16--- debian/control 2010-11-30 18:33:14 +0000
17+++ debian/control 2010-12-01 16:04:28 +0000
18@@ -88,8 +88,8 @@
19 Package: kdeartwork-theme-window
20 Architecture: any
21 Depends: ${misc:Depends}
22-Replaces: aurorae-themes-artwork (<= 4:4.5.2-1ubuntu1)
23-Conflicts: aurorae-themes-artwork (<= 4:4.5.2-1ubuntu1)
24+Replaces: aurorae-themes-artwork
25+Conflicts: aurorae-themes-artwork
26 Section: kde
27 Description: window decoration for the K Window manager (KWin)
28 This package contains additional window decorations for K Window Manager

Subscribers

People subscribed via source and target branches

to all changes: