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

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Tue Mar 8 21:08:17 UTC 2011


The following commit has been merged in the master branch:
commit 3674ae25f5cb8a54ff1b2396068b7a21aa289464
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Mar 8 21:29:26 2011 +0100

    Bump Standards-Version to 3.9.1: update Breaks/Replaces/Conflicts.
---
 debian/changelog |    1 +
 debian/control   |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 32ef232..a7a9b66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ kdeplasma-addons (4:4.6.1-0r0) UNRELEASED; urgency=low
   * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
   * Add plasma-containments-addons package.
   * Add libqtwebkit-dev build dependency.
+  * Bump Standards-Version to 3.9.1: update Breaks/Replaces/Conflicts.
 
  -- 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 1d446bf..6b57dcc 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
  libqt4-opengl-dev, libboost-dev, libkexiv2-dev (>= 4:4.4), python, libmarble-dev (>= 4:4.6),
  libqimageblitz-dev, libeigen2-dev, libxrender-dev, shared-desktop-ontologies, libattica-dev,
  libscim-dev, libxtst-dev, libqalculate-dev, libqca2-dev, libqtwebkit-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdeplasma-addons.git
@@ -38,7 +38,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
  plasma-dataengines-addons (= ${binary:Version}),
 Recommends: plasma-widget-lancelot
 Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applets-addons, plasma-widget-weather
-Conflicts: kdeplasma-addons-data, plasma-applets-addons, plasma-widget-weather
+Breaks: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applets-addons, plasma-widget-weather
 Description: additional widgets for Plasma
  This package contains additional Plasma widgets shipped in the Plasma
  addons module. Install it if you want a variety of widgets on your Plasma
@@ -65,7 +65,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, kdeplasma-addons-libs4
-Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4
+Breaks: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, kdeplasma-addons-libs4
 Description: additional data engines for Plasma
  This package contains additional Plasma data engines shipped in Plasma
  addons module. These engines are needed by some plasma widgets
@@ -78,7 +78,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, kdeplasma-addons-libs4
-Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4
+Breaks: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, kdeplasma-addons-libs4
 Description: additional runners for Plasma and Krunner
  This package contains additional Plasma runners that are used in krunner
  (the "run command" dialog of Plasma) to reveal special search results.

-- 
KDE Plasma Addons module packaging



More information about the pkg-kde-commits mailing list