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

[Philip Muškovac]

Fixes:

Preparing to replace kde-window-manager 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../kde-window-manager_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb) ...
Unpacking replacement kde-window-manager ...
dpkg: error processing /var/cache/apt/archives/kde-window-manager_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/lib/kde4/libexec/kwin_killer_helper', which is also in package kdebase-workspace-bin 4:4.5.3-0ubuntu1~maverick1~ppa2

Preparing to replace kdebase-workspace-bin 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../kdebase-workspace-bin_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb) ...
Unpacking replacement kdebase-workspace-bin ...
dpkg: error processing /var/cache/apt/archives/kdebase-workspace-bin_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/share/kde4/services/plasma_applet_keyboard.desktop', which is also in package plasma-widgets-workspace 4:4.5.3-0ubuntu1~maverick1~ppa2

Preparing to replace kdebase-workspace-bin 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../kdebase-workspace-bin_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb) ...
Unpacking replacement kdebase-workspace-bin ...
dpkg: error processing /var/cache/apt/archives/kdebase-workspace-bin_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/lib/kde4/kcm_desktoppaths.so', which is also in package systemsettings 4:4.5.3-0ubuntu1~maverick1~ppa2

Preparing to replace kdm 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../kdm_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb) ...
Unpacking replacement kdm ...
dpkg: error processing /var/cache/apt/archives/kdm_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/etc/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf', which is also in package kdebase-workspace-data 4:4.5.3-0ubuntu1~maverick1~ppa2

Preparing to replace kdm 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../kdm_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb) ...
Unpacking replacement kdm ...
dpkg: error processing /var/cache/apt/archives/kdm_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/share/kde4/apps/kdm/themes/oxygen/branding-icon.png', which is also in package kdebase-workspace-wallpapers 4:4.5.3-0ubuntu1~maverick1~ppa2

Preparing to replace plasma-netbook 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../plasma-netbook_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb) ...
Unpacking replacement plasma-netbook ...
dpkg: error processing /var/cache/apt/archives/plasma-netbook_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/share/kde4/services/plasma-sal-development.desktop', which is also in package plasma-widgets-workspace 4:4.5.3-0ubuntu1~maverick1~ppa2

Preparing to replace plasma-desktop 4:4.5.3-0ubuntu1~maverick1~ppa2 (using .../plasma-desktop_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb) ...
Unpacking replacement plasma-desktop ...
dpkg: error processing /var/cache/apt/archives/plasma-desktop_4%3a4.5.80-0ubuntu3~maverick1~ppa2_amd64.deb (--unpack):
 trying to overwrite '/usr/share/kde4/config.kcfg/plasma-shell-desktop.kcfg', which is also in package kdebase-workspace-data 4:4.5.3-0ubuntu1~maverick1~ppa2

[lp:~yofel/kdebase-workspace/4.5.80ubuntu4]

451. By Philip Muškovac on 2010-12-01

that should be << not <=

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-30 20:43:38 +0000
+++ debian/changelog	2010-12-01 16:09:10 +0000
@@ -1,3 +1,9 @@
+kdebase-workspace (4:4.5.80-0ubuntu4) natty; urgency=low
+
+  * bump replaces
+
+ -- Philip Muskovac <[e-mail]>  Wed, 01 Dec 2010 16:09:09 +0100
+
 kdebase-workspace (4:4.5.80-0ubuntu3) natty; urgency=low
 
   * kinfocentre replaces old systemsettings

=== modified file 'debian/control'
--- debian/control	2010-11-30 20:43:38 +0000
+++ debian/control	2010-12-01 16:09:10 +0000
@@ -60,7 +60,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, plasma-widgets-workspace (= ${binary:Version})
 Recommends: kdebase-workspace
 Replaces: kdebase-workspace-bin (<= 4:4.5.2-1ubuntu1), plasma-widgets-workspace (<= 4:4.5.2-0ubuntu1),
- kdebase-workspace-data (<= 4:4.5.2-1ubuntu1)
+ kdebase-workspace-data (<< 4:4.5.80)
 Description: The KDE Plasma workspace for desktop and laptop computers
  Provides the environment for running and managing applications and integrating
  interaction of applications. It is designed as generic environment for all
@@ -74,7 +74,7 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, plasma-widgets-workspace (= ${binary:Version})
 Recommends: kdebase-workspace
-Replaces: plasma-widgets-workspace (<= 4:4.5.2-1ubuntu1)
+Replaces: plasma-widgets-workspace (<< 4:4.5.80)
 Description: The KDE Plasma workspace for netbook computers
  Provides the environment for running and managing applications and integrating
  interaction of applications. It is designed as generic environment for all
@@ -95,7 +95,7 @@
 Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
  kde-window-manager (<< 4:4.5.3-0ubuntu2~), kdebase-workspace-data (<< 4:4.1.82),
  kdebase-workspace-libs4+5, libkfontinst4, kinfocenter (<= 4:4.5.2-1ubuntu1), kdebase-data (<< 4:4.4.80),
- kdebase-runtime (<< 4:4.4.80), plasma-widgets-workspace (<= 4:4.5.2-1ubuntu1), systemsettings (<= 4:4.5.2-0ubuntu1)
+ kdebase-runtime (<< 4:4.4.80), plasma-widgets-workspace (<< 4:4.5.80), systemsettings (<< 4:4.5.80)
 Description: core binaries for the KDE Plasma Workspace
  This package contains miscellaneous programs needed for a basic desktop
  installation. Among other standard KDE Workspace components, the package
@@ -255,7 +255,7 @@
 Recommends: logrotate, xserver-xorg-core | xserver,
  kdebase | x-session-manager | x-window-manager, xterm | x-terminal-emulator
 Suggests: kdepasswd
-Replaces: kdebase-workspace-data (<= 4:4.5.2-0ubuntu1), kdebase-workspace-bin (<= 4:4.5.2-1ubuntu1), kdebase-workspace-wallpapers (<= 4:4.5.2-1ubuntu1)
+Replaces: kdebase-workspace-data (<< 4:4.5.80), kdebase-workspace-bin (<= 4:4.5.2-1ubuntu1), kdebase-workspace-wallpapers (<< 4:4.5.80)
 Conflicts: desktop-base (<< 4.0.4), kdebase-data (<< 4:4.0.0-1), kde-kdm-themes, kdmtheme
 Provides: x-display-manager
 Description: KDE Display Manager for X11
@@ -321,7 +321,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Provides: x-window-manager
-Replaces: kdebase-workspace-data (<< 4:4.4.80), kdebase-workspace-bin (<= 4:4.5.2-1ubuntu1),
+Replaces: kdebase-workspace-data (<< 4:4.4.80), kdebase-workspace-bin (<< 4:4.5.80),
  kwin, kdebase-runtime-data (<< 4:4.4.0), kwin-style-aurorae
 Conflicts: kwin, kwin-style-aurorae
 Description: the K window manager (KWin)