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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-03 15:49:25 +0000 (Tue, 03 Jan 2006)
New Revision: 846

Modified:
   branches/samba4/changelog
   branches/samba4/control
Log:
Make samba-client Replaces/Conflicts smbclient.



Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-03 15:46:07 UTC (rev 845)
+++ branches/samba4/changelog	2006-01-03 15:49:25 UTC (rev 846)
@@ -16,8 +16,9 @@
     * Check for upgrade from << 3.9.0 in postinst, and upgrade if the user
       wished to.
   * Only provision in samba.postinst if we're being called with "configure".
+  * Make samba-client Replaces/Conflicts smbclient. 
 
- -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 15:55:14 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 16:48:57 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 

Modified: branches/samba4/control
===================================================================
--- branches/samba4/control	2006-01-03 15:46:07 UTC (rev 845)
+++ branches/samba4/control	2006-01-03 15:49:25 UTC (rev 846)
@@ -25,6 +25,8 @@
 Package: samba-client
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: smbclient
+Conflicts: smbclient
 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