[SCM] mate-desktop-environment Debian package branch, master, updated. debian/1.8.0+6-2-gd41698b

[Stefano Karapetsas]

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

The following commit has been merged in the master branch:
commit d41698b694596f5df9abdc51d3b26ff60f0aa48d
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Sat Jul 12 13:00:20 2014 +0200

    Dont conflict with mate-calc
---
 debian/control | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 078f1a8..fcbf0bd 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,7 @@ Depends: ${misc:Depends},
          mate-desktop (>= 1.8.0),
          gvfs-bin,
 Breaks: mate-desktop-environment (<< 1.8.0),
-Conflicts: mate-calc,
-           mate-conf,
+Conflicts: mate-conf,
            mate-conf-editor,
            mate-dialogs,
            mate-dialogs-common,
@@ -40,8 +39,7 @@ Conflicts: mate-calc,
            mate-keyring,
            mate-doc-utils,
            mate-doc-utils-gnome,
-Replaces: mate-calc (<< 1.8.0),
-          mate-conf (<< 1.8.0),
+Replaces: mate-conf (<< 1.8.0),
           mate-conf-editor (<< 1.8.0),
           mate-dialogs (<< 1.8.0),
           mate-dialogs-common (<< 1.8.0),

-- 
mate-desktop-environment Debian package