[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.4.5-2-35-g0a03a80

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Tue Feb 1 20:43:09 UTC 2011


The following commit has been merged in the master branch:
commit 0a03a80547271487c630de6f6f216e2680647ea2
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Feb 1 20:57:38 2011 +0100

    Bump S-V to 3.9.1, update replaces/breaks/conflicts.
---
 debian/changelog |    2 ++
 debian/control   |   40 ++++++++++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17314ff..eab6197 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ kdepimlibs (4:4.6.0-0r1) UNRELEASED; urgency=low
   * Add packages libkcalcore4, libkcalutils4, libkmbox4 and 
     libakonadi-calendar4. TODO: Add proper descriptions.
   * Bump kde-sc-dev-latest build dependency to 4:4.6.0.
+  * Bump S-V to 3.9.1: add breaks next to replaces and replace conflicts with
+    breaks where needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Aug 2010 10:41:56 +0300
 
diff --git a/debian/control b/debian/control
index ed20a55..a453d5c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.0),
  libboost-dev, libboost-graph-dev, shared-mime-info,
  libakonadi-dev (>= 1.5.0), libical-dev (>= 0.42),
  shared-desktop-ontologies, libsoprano-dev, xsltproc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://pim.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdepimlibs.git
@@ -28,8 +28,8 @@ Package: kdepimlibs5-dev
 Section: libdevel
 Architecture: any
 Depends: ${sameVersionDep:kdelibs5-dev:libakonadi-kde4}, ${allLibraries}
-Replaces: kdepimlibs-data (<< 4:4.1.80)
-Conflicts: libkleopatra1-dev
+Replaces: kdepimlibs-data (<< 4:4.1.80), libkleopatra1-dev
+Breaks: kdepimlibs-data (<< 4:4.1.80), libkleopatra1-dev
 Description: development files for the KDE Development Platform PIM libraries
  This package contains development files for building software that uses
  the KDE Development Platform Personal Information Management libraries.
@@ -41,7 +41,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsasl2-modules
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: kio slaves used by KDE PIM applications
  This package contains the imap4, ldap, mbox, nntp, pop3, sieve and smtp kio
  slaves.
@@ -53,6 +53,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepim-runtime (<< 4:4.4.0)
+Breaks: kdepim-runtime (<< 4:4.4.0)
 Description: library for using the Akonadi PIM data server
  This is the client access library for using the Akonadi PIM data server.
  .
@@ -63,6 +64,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), akonadi-kde (<< 4:4.1.80)
+Breaks: kdepimlibs5 (<< 4:4.4.0), akonadi-kde (<< 4:4.1.80)
 Description: library for using the Akonadi PIM data server
  This is the client access library for using the Akonadi PIM data server.
  .
@@ -73,6 +75,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepim-runtime (<< 4:4.4.0), akonadi-kde (<< 4:4.1.80)
+Breaks: kdepim-runtime (<< 4:4.4.0), akonadi-kde (<< 4:4.1.80)
 Description: library for using the Akonadi PIM data server
  This is the client access library for using the Akonadi PIM data server.
  .
@@ -83,7 +86,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: library for using the Akonadi PIM data server
  This is the client access library for using the Akonadi PIM data server.
  .
@@ -94,7 +97,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: library for using the Akonadi PIM data server
  This is the client access library for using the Akonadi PIM data server.
  .
@@ -105,6 +108,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: c++ wrapper library for gpgme
  GpgME++ is a C++ wrapper (or C++ bindings) for the GnuPG project's gpgme
  (GnuPG Made Easy) library.
@@ -116,7 +120,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: library for handling address book data
  This library provides an API for address book data. It includes features
  such as:
@@ -140,6 +144,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: client-side support library for web application remote blogging APIs
  KBlog is a library for calling functions on Blogger 1.0, MetaWeblog,
  MovableType and GData compatible blogs. It calls the APIs using KXmlRpcClient
@@ -155,7 +160,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: library for handling calendar data
  This library provides access to and handling of calendar data. It supports
  the standard formats iCalendar and vCalendar and the group scheduling
@@ -190,7 +195,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: holidays calculation library
  This library provides a C++ API that determines holiday and other special
  events for a geographical region.
@@ -202,6 +207,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsasl2-modules
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for handling IMAP data
  This library provides an API for handling data received from IMAP services.
  IMAP (Internet Message Access Protocol) is one of the two most prevalent
@@ -214,6 +220,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for accessing LDAP
  This is a library for accessing LDAP with a convenient Qt style C++ API.
  LDAP (Lightweight Directory Access Protocol) is an application protocol
@@ -244,6 +251,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for handling MIME data
  This library provides an API for handling MIME data. MIME (Multipurpose
  Internet Mail Extensions) is an Internet Standard that extends the format
@@ -257,8 +265,8 @@ Package: libkontactinterface4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libkontactinterfaces4
 Replaces: kontact (<< 4:4.1.80), libkontactinterfaces4
+Breaks: kontact (<< 4:4.1.80), libkontactinterfaces4
 Description: Kontact interface library
  This library provides the glue necessary for application "Parts" to be
  embedded as a Kontact component (or plugin).
@@ -270,6 +278,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for managing user identities
  This library provides an API for managing user identities.
  .
@@ -280,6 +289,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library that provides a textedit with PIM-specific features
  KPIMTextedit provides a textedit with PIM-specific features. It also provides
  so-called rich text builders which can convert the formatted text in the text
@@ -292,6 +302,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for dealing with email addresses
  This library contains utility functions for dealing with email addresses.
  This includes parsing, splitting and munging email addresses represented
@@ -305,7 +316,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: the KDE Resource framework library
  This library provides a framework for managing resources of different types,
  organized in families. The Resource framework is for example used for
@@ -318,6 +329,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for handling TNEF data
  Ktnef is a library for handling data in the TNEF format (Transport Neutral
  Encapsulation Format, a proprietary format of e-mail attachment used by
@@ -332,6 +344,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: simple XML-RPC client library
  This library contains simple XML-RPC client support. It is used mainly by the
  egroupware module of kdepim, but is a complete client and is quite easy to use.
@@ -343,7 +356,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
-Conflicts: kdepimlibs-data
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Description: mail transport service library
  Mailtransport is a library that provides the following functionality:
  .
@@ -361,6 +374,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for using the Microblog Akonadi Resource
  Microblog is a library that provides some helper functions for using
  the Microblog Akonadi Resource.
@@ -372,6 +386,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: library for GpgME++ integration with Qt
  QGpgME is a library that provides GpgME++ integration with QEventLoop
  and some Qt datatypes (e.g. QByteArray).
@@ -383,6 +398,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0)
 Description: parser library for RSS and Atom feeds
  Syndication is a parser library for RSS and Atom feeds. It offers a unified,
  format-agnostic view on the parsed feed, so that the using application does

-- 
KDE PIM Libraries module packaging



More information about the pkg-kde-commits mailing list