[Pkg-samba-maint] r2517 - trunk/samba4/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-26 00:07:15 +0000 (Mon, 26 Jan 2009)
New Revision: 2517

Modified:
   trunk/samba4/debian/control
Log:
Remove no longer necessary conflicts.

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2009-01-25 22:19:50 UTC (rev 2516)
+++ trunk/samba4/debian/control	2009-01-26 00:07:15 UTC (rev 2517)
@@ -14,7 +14,7 @@
 Package: samba4
 Architecture: any
 Recommends: samba-ldb-tools
-Conflicts: samba, samba-tools
+Conflicts: samba-tools
 Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common (=${binary:Version}), python, python-samba
 XB-Python-Version: ${python:Versions}
 Description: LanManager-like file server for Unix (version 4)
@@ -32,7 +32,6 @@
 
 Package: samba4-common
 Architecture: any
-Conflicts: samba, samba-common
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Samba 4 common files used by both the server and the client
  The Samba software suite is a collection of programs that