[SCM] mate-menus Debian package branch, master, updated. f678d78a3976c7dc6d8d0718499d51b2445897f9

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-menus.git;a=commitdiff;h=251bb8f

The following commit has been merged in the master branch:
commit 251bb8f29df3f7e0d5e07547eb0703f8cc9c9e77
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jan 12 12:07:40 2014 +0100

    debian/control: use Breaks: / Replaces: instead of Conflicts: field
---
 debian/control | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 5a503e9..5f724a6 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,6 @@ Depends: ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mate-menus (<= 1.0.2-1), libmatemenu
 Replaces: mate-menus (<= 1.0.2-1), libmatemenu
-Conflicts: libmatemenu
 Provides: libmatemenu
 Description: implementation of the freedesktop menu specification for MATE (library)
  The package contains an implementation of the draft
@@ -59,9 +58,8 @@ Depends: ${misc:Depends},
          libmate-menu2 (= ${binary:Version}),
          mate-menus (= ${binary:Version}),
          libglib2.0-dev
-Conflicts: libmatemenu-dev
-Replaces: libmatemenu-dev
 Breaks: libmatemenu-dev
+Replaces: libmatemenu-dev
 Provides: libmatemenu-dev
 Description: implementation of the freedesktop menu specification for MATE (development files)
  The package contains an implementation of the draft

-- 
mate-menus Debian package