Merge lp:~yofel/kdebase-workspace/4.5.80ubuntu4_2 into lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace

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

Description of the change

Fixes:

Preparing to replace plasma-desktop 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../plasma-desktop_4%3a4.5.80-0ubuntu4~maverick1~ppa2_amd64.deb) ...
Unpacking replacement plasma-desktop ...
Replacing files in old package kdebase-workspace-data ...
dpkg: error processing /var/cache/apt/archives/plasma-desktop_4%3a4.5.80-0ubuntu4~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/share/kde4/services/plasma-containment-desktopdashboard.desktop', which is also in package plasma-widgets-workspace 4:4.5.3-0ubuntu1~maverick1~ppa2
dpkg-deb: subprocess paste killed by signal (Broken pipe)
Preparing to replace libplasmagenericshell4 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../libplasmagenericshell4_4%3a4.5.80-0ubuntu4~maverick1~ppa2_amd64.deb) ...
Unpacking replacement libplasmagenericshell4 ...
dpkg: error processing /var/cache/apt/archives/libplasmagenericshell4_4%3a4.5.80-0ubuntu4~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/share/kde4/servicetypes/plasma-layout-template.desktop', which is also in package plasma-widgets-workspace 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
1=== modified file 'debian/control'
2--- debian/control 2010-12-01 16:06:41 +0000
3+++ debian/control 2010-12-01 21:10:48 +0000
4@@ -59,7 +59,7 @@
5 Architecture: any
6 Depends: ${misc:Depends}, ${shlibs:Depends}, plasma-widgets-workspace (= ${binary:Version})
7 Recommends: kdebase-workspace
8-Replaces: kdebase-workspace-bin (<= 4:4.5.2-1ubuntu1), plasma-widgets-workspace (<= 4:4.5.2-0ubuntu1),
9+Replaces: kdebase-workspace-bin (<= 4:4.5.2-1ubuntu1), plasma-widgets-workspace (<< 4:4.5.80),
10 kdebase-workspace-data (<< 4:4.5.80)
11 Description: The KDE Plasma workspace for desktop and laptop computers
12 Provides the environment for running and managing applications and integrating
13@@ -470,7 +470,7 @@
14 Section: libs
15 Architecture: any
16 Depends: ${shlibs:Depends}, ${misc:Depends}
17-Replaces: plasma-widgets-workspace (<= 4:4.5.2-1ubuntu1)
18+Replaces: plasma-widgets-workspace (<< 4:4.5.80)
19 Description: shared elements for all the plasma shells
20 This library contains elements shared by the plasma desktop shell,
21 the plasma netbook shell and the plasma screensaver overlay.

Subscribers

People subscribed via source and target branches

to all changes: