[Pkg-samba-maint] r2585 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-02-16 02:19:02 +0000 (Mon, 16 Feb 2009)
New Revision: 2585

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
Log:
Make samba conflict with samba4, not with itself.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-02-16 02:14:13 UTC (rev 2584)
+++ trunk/samba/debian/changelog	2009-02-16 02:19:02 UTC (rev 2585)
@@ -2,6 +2,7 @@
 
   [ Steve Langasek ]
   * Re-add smb.conf fixes that were dropped in the 3.3.0 merge to unstable.
+  * Make samba conflict with samba4, not with itself.
 
   [ Debconf translations ]
   * Vietnamese updated.  Closes: #515235.

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2009-02-16 02:14:13 UTC (rev 2584)
+++ trunk/samba/debian/control	2009-02-16 02:19:02 UTC (rev 2585)
@@ -13,7 +13,7 @@
 Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools
 Replaces: samba-common (<= 2.0.5a-2)
-Conflicts: samba (<< 4.0.0~alpha6-2)
+Conflicts: samba4 (<< 4.0.0~alpha6-2)
 Description: SMB/CIFS file, print, and login server for Unix
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with