[Pkg-samba-maint] r912 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-06 02:54:13 +0000 (Fri, 06 Jan 2006)
New Revision: 912

Modified:
   branches/samba4/changelog
   branches/samba4/control
Log:
Let samba-clients conflict/replace samba-common (<< 3.9.0), as they share
/usr/bin/net.


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-06 02:41:33 UTC (rev 911)
+++ branches/samba4/changelog	2006-01-06 02:54:13 UTC (rev 912)
@@ -1,6 +1,6 @@
 samba (3.9.0+SVN12727-1) UNRELEASED; urgency=low
 
-  * Move /usr/lib/samba/setup from samba-common to samba. 
+  * Move /usr/lib/samba/setup from samba-common to samba.
     * Make samba replace samba-common (<= 3.9.0+SVN12726-1)
   * Add a missing db_stop in samba.postinst, probably causing problems
     starting the daemon in some cases.
@@ -23,8 +23,10 @@
   * Removed unused file samba.conffiles.
   * Run dh_installdebconf on architecture-independent packages as well, now
     that samba-common has a config script.
+  * Let samba-clients conflict/replace samba-common (<< 3.9.0), as they share
+    /usr/bin/net. 
 
- -- Steinar H. Gunderson <sesse at debian.org>  Thu,  5 Jan 2006 23:41:19 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Fri,  6 Jan 2006 03:52:24 +0100
 
 samba (3.9.0+SVN12726-1) experimental; urgency=low
 

Modified: branches/samba4/control
===================================================================
--- branches/samba4/control	2006-01-06 02:41:33 UTC (rev 911)
+++ branches/samba4/control	2006-01-06 02:54:13 UTC (rev 912)
@@ -44,8 +44,8 @@
 Package: samba-clients
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: smbclient
-Conflicts: smbclient
+Replaces: smbclient, samba-common (<< 3.9.0)
+Conflicts: smbclient, samba-common (<< 3.9.0)
 Description: client utilities from Samba 4
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve