[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.4.5-1-83-g29b9aa6

Modestas Vainius modax at alioth.debian.org
Wed Apr 6 14:46:51 UTC 2011


The following commit has been merged in the master branch:
commit 36302e3279a62182c9ca96b8a7b352c13160e58a
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Apr 6 17:15:57 2011 +0300

    Clean up Replaces/Breaks which predate squeeze and can be cleaned up.
---
 debian/changelog |    1 +
 debian/control   |   41 ++++++++++++++++-------------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e9d539..bd932ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ kdebase-runtime (4:4.6.2-0r0) UNRELEASED; urgency=low
   * Add kdebase-workspace-bin (<< 4:4.6) to kdebase-runtime Replaces/Breaks
     due to moved kded_networkstatus.
   * Bump debhelper build dependency to 7.2.7~.
+  * Clean up Replaces/Breaks which predate squeeze and can be cleaned up.
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/control b/debian/control
index 62f4ca0..f28f14d 100644
--- a/debian/control
+++ b/debian/control
@@ -31,14 +31,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
  shared-desktop-ontologies, plasma-scriptengine-javascript (= ${binary:Version})
 Recommends: virtuoso-minimal
 Suggests: djvulibre-bin, icoutils
-Replaces: kdebase-bin (<< 4:4.2.90), kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.80),
- kdebase-workspace-bin (<< 4:4.6), kdebase-bin-kde3, kdebase-runtime-bin-kde4, kcontrol,
- kdebase-runtime-data (<< 4:4.4.0), kdelibs5-plugins (<< 4:4.5.0), kdebluetooth (<< 1.0~beta7-1),
- kdebase-kio-plugins, plasma-netbook (<< 4:4.5.95)
-Breaks: kdebase-bin (<< 4:4.2.90), kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.80),
- kdebase-workspace-bin (<< 4:4.6), kdebase-bin-kde3, kdebase-runtime-bin-kde4, kcontrol,
- kdebase-runtime-data (<< 4:4.4.0), kdelibs5-plugins (<< 4:4.5.0), kdebluetooth (<< 1.0~beta7-1),
- kdebase-kio-plugins, plasma-netbook (<< 4:4.5.95), phonon-backend-xine (<< 4:4.2.80)
+Replaces: kdebase-runtime-bin-kde4,
+ kdelibs5-plugins (<< 4:4.5), kdebase-workspace-bin (<< 4:4.6),
+ kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95)
+Breaks: kdebase-runtime-bin-kde4,
+ kdelibs5-plugins (<< 4:4.5), kdebase-workspace-bin (<< 4:4.6),
+ kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95)
 Conflicts: kdelibs4-dev
 Description: runtime components from the official KDE release
  KDE is produced by an international technology team that creates free and open
@@ -54,15 +52,12 @@ Package: kdebase-runtime-data
 Section: kde
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}
-Replaces: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs5-data (<< 4:4.5.0),
- kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<= 4:4.2.4-1),
- kdebase-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1175124-1),
- kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95)
-Breaks: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs5-data (<< 4:4.5.0),
- kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<= 4:4.2.4-1),
- kdebase-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1175124-1),
- kdebase-workspace-bin (<< 4:4.5.95), phonon-backend-xine (<< 4:4.2.80),
- plasma-widget-networkmanagement (<< 0.1+git20110318.941cde9-2~), plasma-netbook (<< 4:4.5.95)
+Replaces: kdebase-bin-kde3, kcontrol, kdebase-kio-plugins, kdebase-runtime-data-common,
+ kdelibs5-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95),
+ plasma-widget-networkmanagement (<= 0.1+git20110318.941cde9-2~)
+Breaks: kdebase-bin-kde3, kcontrol, kdebase-kio-plugins, kdebase-runtime-data-common,
+ kdelibs5-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95),
+ plasma-widget-networkmanagement (<< 0.1+git20110318.941cde9-2~)
 Description: shared data files for the KDE base runtime module
  This package contains the architecture-independent shared data files needed to
  run KDE applications.
@@ -74,8 +69,8 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: htdig
-Replaces: kdebase-runtime-data (<< 4:4.0.80-2), kdebase-runtime (<< 4:4.0.80-2), khelpcenter
-Breaks: kdebase-runtime-data (<< 4:4.0.80-2), kdebase-runtime (<< 4:4.0.80-2), khelpcenter
+Replaces: khelpcenter
+Breaks: khelpcenter
 Description: help center
  The KDE Help Center displays documentation on how to use the KDE plasma
  workspaces and applications, as well as UNIX man and info pages.
@@ -87,8 +82,6 @@ Package: kde-config-phonon-xine
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}, ${xine-console:Depends}
-Replaces: kdebase-runtime-data (<< 4:4.4.0), kdebase-runtime (<< 4:4.4.0)
-Breaks: kdebase-runtime-data (<< 4:4.4.0), kdebase-runtime (<< 4:4.4.0)
 Description: advanced Phonon Xine configuration
  This package contains a configuration module for tweaking some of the more
  advanced settings for Phonon's Xine backend.
@@ -99,8 +92,6 @@ Package: plasma-scriptengine-javascript
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82)
-Breaks: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82)
 Description: JavaScript script engine for Plasma
  This package provides the JavaScript script engine for Plasma. You have to
  install it if you want to use Plasma widgets and data engines written in
@@ -113,8 +104,8 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends}, kdebase-runtime (= ${binary:Version}), kdelibs5-dbg
-Replaces: kdelibs5-dbg (<< 4:4.5.0), kdebase-dbg (<< 4:4.2.90), kdebase-workspace-dbg (<< 4:4.6)
-Breaks: kdelibs5-dbg (<< 4:4.5.0), kdebase-dbg (<< 4:4.2.90), kdebase-workspace-dbg (<< 4:4.6)
+Replaces: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6)
+Breaks: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6)
 COnflicts: kdelibs-dbg
 Description: debugging symbols for KDE base runtime module
  This package contains the debugging symbols associated with kdebase-runtime.

-- 
KDE Base Runtime module packaging



More information about the pkg-kde-commits mailing list