[SCM] KDE Base Runtime module packaging branch, kde4.5, updated. debian/4.4.5-1-18-g9e763f6

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Fri Aug 27 20:11:44 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 9e763f6e73eb758ff24d64e1dfb880650fa4bd36
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Aug 27 22:11:09 2010 +0200

    -data replaces plasma-widget-networkmanagement
---
 debian/changelog |    6 ++++++
 debian/control   |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8876b39..e4f26a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,12 @@ kdebase-runtime (4:4.5.0+svn1166505-0r1) UNRELEASED; urgency=low
     - libqt4-opengl-dev
     - libpulse-dev
 
+  [ José Manuel Santamaría Lema ]
+  * Add replaces:
+    - kdebase-runtime-data replaces plasma-widget-networkmanagement <=
+      0.1~svn1141976-1 because they both install
+      /usr/share/kde4/apps/desktoptheme/default/icons/network.svgz
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 30 Jul 2010 14:51:46 +0300
 
 kdebase-runtime (4:4.4.5-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b6b7a0e..f4b3953 100644
--- a/debian/control
+++ b/debian/control
@@ -50,9 +50,9 @@ 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
+ kdebase-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1141976-1)
 Conflicts: drkonqi, phonon-backend-xine (<< 4:4.2.80), kdebase-runtime-data-common,
- kdebase-bin (<< 4:4.0.0), kdebase-data (<< 4:4.0.0)
+ kdebase-bin (<< 4:4.0.0), kdebase-data (<< 4:4.0.0), plasma-widget-networkmanagement (<= 0.1~svn1141976-1)
 Description: shared data files for the KDE base runtime module
  This package contains the architecture-independent shared data files needed to
  run KDE applications.

-- 
KDE Base Runtime module packaging



More information about the pkg-kde-commits mailing list