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

George Kiagiadakis gkiagia-guest at alioth.debian.org
Mon Aug 30 09:57:57 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 36d19bed6d931ef7ed2e479a21e82d7ea469662c
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Aug 29 19:11:17 2010 +0300

    Do not conflict plasma-widget-networkmanagement, just replace it.
---
 debian/control |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index f4b3953..ba7a76d 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Replaces: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs
  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~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), plasma-widget-networkmanagement (<= 0.1~svn1141976-1)
+ kdebase-bin (<< 4:4.0.0), kdebase-data (<< 4:4.0.0)
 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