[SCM] mate-window-manager Debian package branch, master, updated. 93125dc4e007ccd45a7c12a1d1f5a90acc856e89

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=7f65ca8

The following commit has been merged in the master branch:
commit 7f65ca8259475be771e5accdd018df497443fa73
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 20 15:28:54 2014 +0100

    debian/control: rename src:package to 'marco', improve package SYNOPSES, remove a Conflicts: field
---
 debian/control | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 81459dd..8a1b26e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mate-window-manager
+Source: marco
 Section: x11
 Priority: optional
 Maintainer: MATE Packaging Team <pkg-mate-team at lists.alioth.debian.org>
@@ -43,7 +43,7 @@ Depends: ${shlibs:Depends},
          libmarco-private0 (= ${binary:Version}),
 Breaks: mate-window-manager (<= 1.0.0-2)
 Provides: x-window-manager
-Description: lightweight GTK+ window manager
+Description: lightweight GTK+ window manager for MATE
  Marco is a small window manager, using GTK+ to do everything. It is
  developed mainly for the MATE Desktop.
 
@@ -51,7 +51,7 @@ Package: marco-common
 Architecture: all
 Depends: ${misc:Depends}
 Breaks: mate-window-manager (<= 1.0.0-2)
-Description: launcher and docking facility for MATE (common files)
+Description: lightweight GTK+ window manager for MATE (common files)
  Marco is a small window manager, using GTK+ to do everything. It is
  developed mainly for the MATE Desktop.
  .
@@ -64,7 +64,7 @@ Architecture: any
 Depends: ${misc:Depends},
          marco (= ${binary:Version}),
          libmarco-private0 (= ${binary:Version}),
-Description: lightweight GTK+ window manager (debugging symbols)
+Description: lightweight GTK+ window manager for MATE (debugging symbols)
  This package contains debugging symbols for marco and the
  libmarco-private0 library. It is provided to help debugging problems.
  The debugging symbols are installed in /usr/lib/debug and will
@@ -77,7 +77,6 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
 Breaks: mate-window-manager (<= 1.0.0-2),
         libmarco,
-Conflicts: libmarco
 Replaces: libmarco
 Provides: libmarco
 Description: library for marco window manager

-- 
mate-window-manager Debian package