[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.4.5-1-76-g9ad1291
Modestas Vainius
modax at alioth.debian.org
Wed Mar 30 01:20:28 UTC 2011
The following commit has been merged in the master branch:
commit 18bd74b6fe196a61fc30fa6ad0247454ca8ad0bd
Author: Modestas Vainius <modax at debian.org>
Date: Wed Mar 30 03:01:54 2011 +0300
Add Breaks against conflicting plasma-widget-nm to kdebase-runtime-data.
kdebase-runtime-data breaks plasma-widget-networkmanagement earlier than
0.1+git20110318.941cde9-2.
---
debian/changelog | 2 ++
debian/control | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bb394d2..6c49263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ kdebase-runtime (4:4.6.1-0r3) UNRELEASED; urgency=low
* No longer do custom phonon setup.
* kdebase-runtime: move Depends, Recommends, Suggests above Replaces.
* Make kdebase-runtime depend on oxygen-icon-theme 4.6.
+ * kdebase-runtime-data breaks plasma-widget-networkmanagement earlier than
+ 0.1+git20110318.941cde9-2.
[ George Kiagiadakis ]
* Change my email address in uploaders.
diff --git a/debian/control b/debian/control
index a366403..841bdb2 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,8 @@ Replaces: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs
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)
+ kdebase-workspace-bin (<< 4:4.5.95), phonon-backend-xine (<< 4:4.2.80),
+ 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.
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list