[mate-session-manager] 07/10: debian/control: Processed with wrap-and-sort.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository mate-session-manager.

commit fb80b2359281e505909d1bc12f23b30c401506f9
Author: Martin Wimpress <code at flexion.org>
Date:   Thu May 5 10:27:59 2016 +0100

    debian/control: Processed with wrap-and-sort.
---
 debian/control | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index c71010d..a3ad0ad 100644
--- a/debian/control
+++ b/debian/control
@@ -32,9 +32,9 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-mate/mate-session-manager.git
 
 Package: mate-session-manager
 Architecture: any
-Depends: mint-mate-default-settings | ubuntu-mate-default-settings | debian-mate-default-settings (>= ${source:Version}),
-         dbus-x11,
+Depends: dbus-x11,
          mate-desktop-common (>= 1.14.0),
+         mint-mate-default-settings | ubuntu-mate-default-settings | debian-mate-default-settings (>= ${source:Version}),
          upower,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -75,8 +75,8 @@ Architecture: all
 Depends: desktop-file-utils,
          ${misc:Depends},
 Suggests: mate-desktop-environment-core (>= 1.10.0),
-Conflicts: ubuntu-mate-default-settings,
-           mint-mate-default-settings,
+Conflicts: mint-mate-default-settings,
+           ubuntu-mate-default-settings,
 Description: Default settings for MATE on Debian
  This package comes together with mate-session-manager as provided by upstream
  but does a little tweaking here and there to provide best experience of the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-session-manager.git