[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.4.5-1-18-g59a8e6e

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Sat Mar 5 22:28:53 UTC 2011


The following commit has been merged in the master branch:
commit 097c001e3b9b1f2af93a9e0550f0d9c230bee373
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Tue Aug 31 19:59:26 2010 +0300

    Drop replaces/conflicts against liblancelot0/0a from plasma-widget-lancelot.
---
 debian/changelog |    2 ++
 debian/control   |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86ab532..7ff5618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ kdeplasma-addons (4:4.5.1-0r1) UNRELEASED; urgency=low
   * Update installed files.
   * Remove build dependency on libxml2-dev, not needed anymore.
   * Update lintian overrides.
+  * Drop replaces/conflicts against liblancelot0/0a from
+    plasma-widget-lancelot, as they no longer have any common files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Aug 2010 23:04:29 +0200
 
diff --git a/debian/control b/debian/control
index 81eb639..921fb27 100644
--- a/debian/control
+++ b/debian/control
@@ -86,9 +86,8 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applet-lancelot,
- deplasma-addons-libs4, liblancelot0, liblancelot0a
-Conflicts: kdeplasma-addons-data, plasma-applet-lancelot, kdeplasma-addons-libs4,
- liblancelot0, liblancelot0a
+ kdeplasma-addons-libs4
+Conflicts: kdeplasma-addons-data, plasma-applet-lancelot, kdeplasma-addons-libs4
 Description: lancelot widget for Plasma
  Lancelot is an application launcher menu (or ALI) for Plasma designed to
  provide a place from which all your jobs begin. It provides quick access

-- 
KDE Plasma Addons module packaging



More information about the pkg-kde-commits mailing list