[SCM] mate-desktop Debian package branch, master, updated. 539d532f287fbd057d15fa543c410e80e56817af

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop.git;a=commitdiff;h=87f10d7

The following commit has been merged in the master branch:
commit 87f10d7fcf1f4562a0476f58b187e0b6338e4075
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jan 11 17:00:39 2014 +0100

    debian/control: Improve packages relations. Don't use Conflicts: field anymore. Rather use Breaks: and Replaces: fields instead.
---
 debian/changelog |  8 ++++++++
 debian/control   | 13 +++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7060a38..6aaeb32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mate-desktop (1.6.1-3) UNRELEASED; urgency=low
+
+  * debian/control:
+    + Improve packages relations. Don't use Conflicts: field anymore. Rather
+      use Breaks: and Replaces: fields instead.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Sat, 11 Jan 2014 16:59:27 +0100
+
 mate-desktop (1.6.1-2) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index cc2d5d9..5d331f3 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,8 @@ Depends: ${misc:Depends},
          hicolor-icon-theme,
          libmate-desktop-2-17,
          mate-desktop-common (= ${source:Version}),
-Conflicts: mate-desktop-gnome
+Breaks: mate-desktop-gnome
+Replaces: mate-desktop-gnome
 Description: Library with common API for various MATE modules
  The MATE component mate-desktop contains the libmate-desktop library, the
  mate-about program, as well as some desktop-wide documents.
@@ -52,6 +53,7 @@ Description: Library with common API for various MATE modules
 Package: mate-desktop-common
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: mate-desktop (<< 1.1.1-1)
 Replaces: mate-desktop (<< 1.1.1-1)
 Description: Library with common API for various MATE modules (common files)
  The MATE component mate-desktop contains the libmate-desktop library, the
@@ -71,7 +73,8 @@ Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: libmatedesktop
-Conflicts: libmatedesktop
+Breaks: libmatedesktop (<< 1.6.1),
+Replaces: libmatedesktop (<< 1.6.1),
 Description: Library with common API for various MATE modules (library)
  The MATE component mate-desktop contains the libmate-desktop library, the
  mate-about program, as well as some desktop-wide documents.
@@ -90,7 +93,8 @@ Depends: ${misc:Depends},
          ${shlibs:Depends},
          libmate-desktop-2-17 (= ${binary:Version}),
          libstartup-notification0-dev,
-Conflicts: libmatedesktop-dev
+Breaks: libmatedesktop-dev
+Replaces: libmatedesktop-dev
 Description: Library with common API for various MATE modules (development files)
  The MATE component mate-desktop contains the libmate-desktop library, the
  mate-about program, as well as some desktop-wide documents.
@@ -106,7 +110,8 @@ Section: doc
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Conflicts: libmatedesktop-doc
+Breaks: libmatedesktop-doc
+Replaces: libmatedesktop-doc
 Description: Library with common API for various MATE modules (documentation files)
  The MATE component mate-desktop contains the libmate-desktop library, the
  mate-about program, as well as some desktop-wide documents.

-- 
mate-desktop Debian package