[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. nodm/0.3-2-25-g6b59ed6

[Enrico Zini]

The following commit has been merged in the master branch:
commit afd2e86d8e9a5482a57fe553aeffdccb453e74ae
Author: Enrico Zini <enrico at enricozini.org>
Date:   Fri Jul 24 01:02:15 2009 +0200

    Removed conflicts with the other X display managers

diff --git a/debian/changelog b/debian/changelog
index 471c64c..c214a8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ nodm (0.5-1) UNRELEASED; urgency=low
 
   * New upstream version
      - truncate ~/.xsession-errors on startup. Closes: #531194.
+  * Removed conflicts with the other X display managers
 
- -- Enrico Zini <enrico at debian.org>  Mon, 06 Jul 2009 19:52:36 +0100
+ -- Enrico Zini <enrico at debian.org>  Fri, 24 Jul 2009 00:56:14 +0200
 
 nodm (0.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7563c76..2fc25d4 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/nodm.git;a=summary
 Package: nodm
 Architecture: any
 Depends: xinit, x11-common, xterm | x-terminal-emulator, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: gdm, xdm, kdm, x-display-manager, zhone-session
+Conflicts: zhone-session
 Description: automatic display manager
  This package prepares the system to automatically start an X session at
  system boot. It is meant for devices like smartphones, but can be used on

-- 
Automatic Display Manager