[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.4-6-g3103a55

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 3103a55859786cfc3ff5a5f3b8a0240f44ffa0fc
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Oct 7 22:45:20 2008 +0200

    Conflict with zhone-session

diff --git a/debian/control b/debian/control
index 71be0cd..59e8e5f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/nodm.git;a=summary
 Package: nodm
 Architecture: all
 Depends: xinit, x11-common
-Conflicts: gdm, xdm, kdm, x-display-manager
+Conflicts: gdm, xdm, kdm, x-display-manager, zhone-session
 Description: Automatic Display Manager
  This packages prepares the system to automatically start an X session at
  system boot. It is targeted for devices like smartphones, but can be used

-- 
Automatic Display Manager