[SCM] KDE SDK module packaging branch, master, updated. debian/4.4.5-1-32-g66eef56

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Fri Mar 4 01:09:45 UTC 2011


The following commit has been merged in the master branch:
commit 66eef56fa6be4e4b952ed1327201bd46bc59060f
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Mar 3 22:42:27 2011 +0100

    Bump S-V to 3.9.1; update Replaces/Breaks/Conflicts.
---
 debian/changelog |    1 +
 debian/control   |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ca249f..5f4a32b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ kdesdk (4:4.6.1-0r0) UNRELEASED; urgency=low
   * Remove package kbugbuster.
   * Add package okteta.
   * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
+  * Bump S-V to 3.9.1; update Replaces/Breaks/Conflicts.
   * Add myself to Uploaders.
   
   [ Pino Toscano ]
diff --git a/debian/control b/debian/control
index 1405045..b0dba21 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
  binutils-dev, libhunspell-dev, libltdl-dev, libx11-dev, x11proto-core-dev,
  shared-mime-info (>= 0.30), libkonq5-dev (>= 4:4.6), libantlr-dev, antlr,
  libqca2-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.kde.org
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdesdk.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdesdk.git
@@ -226,6 +226,7 @@ Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}, less
 Replaces: kdesdk-scripts (= 4:4.2.0-1)
+Breaks: kdesdk-scripts (= 4:4.2.0-1)
 Description: memory leak tracer
  KMtrace is a KDE tool to assist with malloc debugging using glibc's
  "mtrace" functionality.
@@ -238,6 +239,7 @@ Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: khelpcenter4
 Replaces: libcvsservice0 (<<4:4.0.0)
+Breaks: libcvsservice0 (<<4:4.0.0)
 Description: file difference viewer 
  Kompare is displays the differences between files.  It can compare the
  contents of files or directories, as well as create, display, and merge patch
@@ -265,7 +267,7 @@ Architecture: any
 Section: vcs
 Depends: ${shlibs:Depends}, ${misc:Depends}, cvs
 Replaces: libcvsservice0
-Conflicts: libcvsservice0
+Breaks: libcvsservice0
 Description: D-Bus service for accessing CVS repositories
  This package provides a D-Bus service for browsing and manipulating
  remote CVS repositories.  Applications may make use of it directly from
@@ -278,6 +280,7 @@ Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdesdk-scripts (= 4:4.2.0-1)
+Breaks: kdesdk-scripts (= 4:4.2.0-1)
 Description: tools for translating DocBook XML files with gettext
  This is a collection of tools that facilitate translating DocBook XML
  files using gettext message files (PO-files).
@@ -352,8 +355,8 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends}, kdebase-runtime-dbg
-Conflicts: kdebase-dbg (<<4:4.0.0)
 Replaces: kdebase-dbg (<<4:4.0.0)
+Breaks: kdebase-dbg (<<4:4.0.0)
 Suggests: kdesdk (= ${source:Version})
 Description: debugging symbols for the KDE Software Development Kit module
  This package contains debugging files used to investigate problems with

-- 
KDE SDK module packaging



More information about the pkg-kde-commits mailing list