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

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

Description of the change

Fixes:

Preparing to replace kdeartwork-dbg 4:4.5.3-0ubuntu1~maverick1~ppa1 (using .../kdeartwork-dbg_4%3a4.5.80-0ubuntu4~maverick1~ppa1_amd64.deb) ...
Unpacking replacement kdeartwork-dbg ...
dpkg: error processing /var/cache/apt/archives/kdeartwork-dbg_4%3a4.5.80-0ubuntu4~maverick1~ppa1_amd64.deb (--unpack):
 trying to overwrite '/usr/lib/debug/usr/lib/kde4/kwin3_kde2.so', which is also in package kdebase-workspace-dbg 4:4.5.3-0ubuntu1~maverick1~ppa2
dpkg-deb: subprocess paste killed by signal (Broken pipe)

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
=== modified file 'debian/changelog'
--- debian/changelog 2010-12-01 17:46:02 +0000
+++ debian/changelog 2010-12-01 21:13:00 +0000
@@ -1,6 +1,7 @@
1kdeartwork (4:4.5.80-0ubuntu4) UNRELEASED; urgency=low1kdeartwork (4:4.5.80-0ubuntu4) UNRELEASED; urgency=low
22
3 * kdeartwork-theme-window replaces aurorae-themes-artwork3 * kdeartwork-theme-window replaces aurorae-themes-artwork
4 * kdeartwork-dbg replaces kdebase-workspace-dbg (<< 4:4.5.80)
45
5 -- Philip Muskovac <yofel@gmx.net> Wed, 01 Dec 2010 16:41:36 +01006 -- Philip Muskovac <yofel@gmx.net> Wed, 01 Dec 2010 16:41:36 +0100
67
78
=== modified file 'debian/control'
--- debian/control 2010-12-01 15:48:52 +0000
+++ debian/control 2010-12-01 21:13:00 +0000
@@ -178,6 +178,7 @@
178Priority: extra178Priority: extra
179Depends: ${shlibs:Depends}, ${misc:Depends}179Depends: ${shlibs:Depends}, ${misc:Depends}
180Suggests: kdeartwork (= ${source:Version})180Suggests: kdeartwork (= ${source:Version})
181Replaces: kdebase-workspace-dbg (<< 4:4.5.80)
181Description: debugging symbols for kdeartwork182Description: debugging symbols for kdeartwork
182 This package contains the debugging files associated with kdeartwork.183 This package contains the debugging files associated with kdeartwork.
183 They will automatically be used by gdb for debugging kdeartwork-related184 They will automatically be used by gdb for debugging kdeartwork-related

Subscribers

People subscribed via source and target branches

to all changes: