[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-127-gfa300b0

Modestas Vainius modax at alioth.debian.org
Wed Apr 6 18:15:46 UTC 2011


The following commit has been merged in the master branch:
commit 90b44e841a94c8c5ab0cde1f30a40a6171b8978d
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Apr 6 17:36:43 2011 +0300

    Clean up Replaces/Breaks which predate squeeze and can be removed.
---
 debian/changelog |    1 +
 debian/control   |   87 ++++++++++++-----------------------------------------
 2 files changed, 21 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9f83ff..432c606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -155,6 +155,7 @@ kdebase-workspace (4:4.6.2-0r0) UNRELEASED; urgency=low
     clashes (from libsolidcontrol4) cause a crash.
   * Do not bother about shlibs anymore: remove -V from the generic
     dh_makeshlibs call.
+  * Clean up Replaces/Breaks which predate squeeze and can be removed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Apr 2011 01:56:57 +0300
 
diff --git a/debian/control b/debian/control
index aab131e..58830cf 100644
--- a/debian/control
+++ b/debian/control
@@ -59,10 +59,9 @@ Package: plasma-desktop
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, plasma-widgets-workspace (= ${binary:Version})
 Recommends: kdebase-workspace
-Replaces: kdebase-workspace-bin (<< 4:4.5.0), kdebase-workspace-data (<< 4:4.5.0),
- plasma-widgets-workspace (<< 4:4.4.0)
-Breaks: kdebase-workspace-bin (<< 4:4.5.0), kdebase-workspace-data (<< 4:4.5.0),
- plasma-widgets-workspace (<< 4:4.4.0), plasma-widget-networkmanagement (<< 0.1+git20110318.941cde9-10~)
+Replaces: kdebase-workspace-bin (<< 4:4.5), kdebase-workspace-data (<< 4:4.5)
+Breaks: kdebase-workspace-bin (<< 4:4.5), kdebase-workspace-data (<< 4:4.5),
+ plasma-widget-networkmanagement (<< 0.1+git20110318.941cde9-10~)
 Description: 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
@@ -94,14 +93,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, iso-codes,
 Recommends: plasma-scriptengines, polkit-kde-1 | policykit-1-gnome,
  upower [linux-any]
 Suggests: x11-xkb-utils
-Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
- kde-window-manager (<< 4:4.1.80), kdebase-workspace-data (<< 4:4.1.82),
- kdebase-workspace-libs4+5, libkfontinst4, ksplash, kdebase-runtime (<< 4:4.5.0),
- kdebase-data (<< 4:4.5.0), kdesktop, libplasma1
-Breaks: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
- kde-window-manager (<< 4:4.1.80), kdebase-workspace-data (<< 4:4.1.82),
- kdebase-workspace-libs4+5, libkfontinst4, ksplash, kdebase-runtime (<< 4:4.5.0),
- kdebase-data (<< 4:4.5.0), kdesktop, libplasma1
+Replaces: kcontrol, kmenuedit, ktip, libkfontinst4, ksplash, kdesktop,
+ kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5)
+Breaks: kcontrol, kmenuedit, ktip, libkfontinst4, kdesktop, ksplash,
+ kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5)
 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
@@ -114,12 +109,10 @@ Description: core binaries for the KDE Plasma Workspace
 Package: kdebase-workspace-data
 Architecture: all
 Depends: oxygencursors, ${misc:Depends}, ${perl:Depends}
-Replaces: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip, kdebase-runtime-data (<< 4:4.5.0), kde-window-manager (<< 4:4.1.80),
- kdm (<< 4:4.2.0-3), systemsettings (<< 4:4.1.80), ksplash, libplasma1
-Breaks: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip, kdebase-runtime-data (<< 4:4.5.0), kde-window-manager (<< 4:4.1.80),
- kdm (<< 4:4.2.0-3), systemsettings (<< 4:4.1.80), ksplash, libplasma1
+Replaces: ksmserver, kmenuedit, ktip, ksplash, libplasma1,
+ kdebase-runtime-data (<< 4:4.5)
+Breaks: ksmserver, kmenuedit, ktip, ksplash, libplasma1,
+ kdebase-runtime-data (<< 4:4.5)
 Description: shared data files for the KDE Plasma Workspace
  This package contains architecture-independent shared data files needed for a
  basic KDE Workspace installation.
@@ -130,10 +123,6 @@ Package: kdebase-workspace-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${allLibraries},
  ${sameVersionDep:kdelibs5-dev:kdebase-workspace-bin},
-Replaces: kdebase-workspace-data (<< 4:4.1.80), ksysguard (<< 4:4.1.80), libplasma-dev (<< 4:4.1.80),
- kde-window-manager (<< 4:4.1.80)
-Breaks: kdebase-workspace-data (<< 4:4.1.80), ksysguard (<< 4:4.1.80), libplasma-dev (<< 4:4.1.80),
- kde-window-manager (<< 4:4.1.80), kdebase-workspace-libs4+5
 Description: development files for the KDE Plasma Workspace
  This package contains development files for building software that uses
  libraries from the KDE Plasma Workspace.
@@ -144,10 +133,6 @@ Package: plasma-dataengines-workspace
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: ksysguardd (= ${binary:Version})
-Replaces: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82),
- systemsettings (<< 4:4.1.80), libplasma2
-Breaks: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82),
- systemsettings (<< 4:4.1.80), libplasma2
 Description: KDE Plasma data engines
  This package contains standard Plasma data engines shipped in KDE Plasma
  workspace. These engines are needed by the standard KDE base
@@ -158,11 +143,7 @@ Description: KDE Plasma data engines
 
 Package: plasma-widgets-workspace
 Architecture: any
-Depends: ${shlibs:Depends}, plasma-dataengines-workspace (= ${binary:Version}), ${misc:Depends}, kdebase-runtime (>> 4.3.3~)
-Replaces: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82), libplasma2,
- plasma-applets-workspace, kdebase-workspace-libs4+5, libplasma-applet-system-monitor4
-Breaks: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82), libplasma2,
- plasma-applets-workspace, kdebase-workspace-libs4+5, libplasma-applet-system-monitor4
+Depends: ${shlibs:Depends}, plasma-dataengines-workspace (= ${binary:Version}), ${misc:Depends}
 Description: plasma widgets and containments for the KDE Plasma Workspace
  This package contains standard Plasma widgets and containments shipped in the
  KDE base workspace module. They provide such basic desktop functionality as
@@ -202,8 +183,6 @@ Description: metapackage to install all Plasma script engines
 Package: plasma-scriptengine-ruby
 Architecture: all
 Depends: libplasma-ruby (>= 4:4.2.0), ${misc:Depends}
-Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82+svn893000)
-Breaks: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82+svn893000)
 Description: Ruby script engine for Plasma
  This package provides the Ruby script engine for Plasma. You have to install it
  if you want to use Plasma widgets and data engines written in Ruby.
@@ -222,8 +201,6 @@ Description: Python script engine for Plasma
 Package: plasma-scriptengine-webkit
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82+svn893000)
-Breaks: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82+svn893000)
 Description: Web and Mac OS X dashboard widget support for Plasma
  This package provides the WebKit script engine for Plasma which adds support
  for the webpage widgets written in HTML and JavaScript and for the Apple
@@ -263,10 +240,8 @@ Depends: ${shlibs:Depends}, debconf | debconf-2.0, lsb-base (>= 3.2-14), console
 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.1.80), kdebase-workspace-bin (<< 4:4.1.80),
- desktop-base (<< 4.0.4), kdebase-data (<< 4:4.0.0-1), kde-kdm-themes, kdmtheme
-Breaks: kdebase-workspace-data (<< 4:4.1.80), kdebase-workspace-bin (<< 4:4.1.80),
- desktop-base (<< 4.0.4), kdebase-data (<< 4:4.0.0-1), kde-kdm-themes, kdmtheme
+Replaces: kde-kdm-themes, kdmtheme
+Breaks: kde-kdm-themes, kdmtheme
 Provides: x-display-manager
 Description: KDE Display Manager for X11
  KDM manages a collection of X servers running on local or remote machines.
@@ -282,8 +257,8 @@ Package: kinfocenter
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol
-Breaks: kdebase-bin (<< 4:4.0.0-1), kcontrol
+Replaces: kcontrol
+Breaks: kcontrol
 Description: system information viewer
  KInfoCenter provides you with a graphical overview of various aspects of your
  system, such as memory usage, storage capacity, and attached devices.
@@ -294,8 +269,6 @@ Package: klipper
 Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-data (<< 4:4.1.80)
-Breaks: kdebase-workspace-data (<< 4:4.1.80)
 Description: clipboard manager
  Klipper is a clipboard manager. It stores a history of the clipboard
  contents and can automatically perform actions when certain items are
@@ -317,8 +290,6 @@ Package: ksysguard
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ksysguardd (= ${binary:Version})
-Replaces: kdebase-workspace-data (<< 4:4.1.80)
-Breaks: kdebase-workspace-data (<< 4:4.1.80)
 Description: process monitor and system statistics
  System Guard allows you to monitor various statistics about your system.
  .
@@ -332,10 +303,6 @@ Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Provides: x-window-manager
-Replaces: kdebase-workspace-data (<< 4:4.1.80), kdebase-workspace-bin (<< 4:4.1.80),
- kwin (<< 4:4), kdebase-runtime-data (<< 4:4.4.0)
-Breaks: kdebase-workspace-data (<< 4:4.1.80), kdebase-workspace-bin (<< 4:4.1.80),
- kwin (<< 4:4), kdebase-runtime-data (<< 4:4.4.0)
 Description: K window manager (KWin)
  This package contains KWin, the KDE window manager, featuring 
  hardware-accelerated compositing effects.
@@ -366,8 +333,6 @@ Description: library used by effects for the KDE window manager
 Package: systemsettings
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-bin (<= 4:4.2.2-2), kdebase-workspace-data (<< 4:4.1.80)
-Breaks: kdebase-workspace-bin (<= 4:4.2.2-2), kdebase-workspace-data (<< 4:4.1.80)
 Description: System Settings
  System Settings is an improved user interface for configuring the desktop
  and other aspects of the system.
@@ -378,8 +343,6 @@ Package: kdebase-workspace-kgreet-plugins
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-bin (<< 4:4.2.4), kdm (<< 4:4.2.0-2)
-Breaks: kdebase-workspace-bin (<< 4:4.2.4), kdm (<< 4:4.2.0-2)
 Description: KDE greet libraries for authentication
  This package contains libraries needed for kdm and locker authentication.
  .
@@ -400,8 +363,6 @@ Section: libs
 Architecture: any
 X-Debian-ABI: 0
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-libs4+5
-Breaks: kdebase-workspace-libs4+5
 Description: library of the KDE Screensaver system
  This package contains libraries needed for kscreensaver.
  .
@@ -412,8 +373,6 @@ Section: libs
 Architecture: any
 X-Debian-ABI: 0
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-libs4+5
-Breaks: kdebase-workspace-libs4+5
 Description: library for ksysguard
  This package contains the library needed for ksysguard, the KDE process
  monitor and system statistics application, and for applications and Plasma
@@ -437,8 +396,6 @@ Section: libs
 Architecture: any
 X-Debian-ABI: 0
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-libs4+5
-Breaks: kdebase-workspace-libs4+5
 Description: library for the kdebase workspace
  This package contains libraries needed for the kdebase workspace.
  .
@@ -449,8 +406,6 @@ Section: libs
 Architecture: any
 X-Debian-ABI: 0
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-libs4+5
-Breaks: kdebase-workspace-libs4+5
 Description: library for ksysguard based priority scheduling
  This package contains libraries needed for ksysguard based scheduling
  priority of a process.
@@ -472,8 +427,6 @@ Section: libs
 Architecture: any
 X-Debian-ABI: 0
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-libs4+5
-Breaks: kdebase-workspace-libs4+5
 Description: library for the Plasma geolocation
  This package contains libraries needed for the Plasma geolocation.
  .
@@ -505,8 +458,8 @@ Architecture: any
 X-Debian-ABI: 0
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: libprocessui4-api
-Replaces: kdebase-workspace-libs4+5, libprocessui4, libprocessui4-api
-Breaks: kdebase-workspace-libs4+5, libprocessui4, libprocessui4-api
+Replaces: libprocessui4, libprocessui4-api
+Breaks: libprocessui4, libprocessui4-api
 Description: library for ksysguard process user interface
  This package contains libraries needed for ksysguard process user interface.
  .
@@ -560,8 +513,8 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg, ${misc:Depends}
-Replaces: kdebase-dbg (<< 4:4.5.0), kdebase-runtime-dbg (<< 4:4.5)
-Breaks: kdebase-dbg (<< 4:4.5.0), kdebase-workspace-libs4+5, kdebase-runtime-dbg (<< 4:4.5)
+Replaces: kdebase-dbg (<< 4:4.5), kdebase-runtime-dbg (<< 4:4.5)
+Breaks: kdebase-dbg (<< 4:4.5), kdebase-runtime-dbg (<< 4:4.5)
 Suggests: kdebase-workspace (>= ${source:Version})
 Description: debugging symbols for the KDE Plasma Workspaces
  This package contains debugging files used to investigate problems with

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list