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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-05 22:50:22 +0000 (Thu, 05 Jan 2006)
New Revision: 896

Modified:
   branches/samba4/changelog
   branches/samba4/control
   branches/samba4/samba-common.install
   branches/samba4/samba.install
Log:
Move /usr/lib/samba/setup from samba-common to samba.
Make samba replace samba-common (<= 3.9.0+SVN12726-1)



Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-05 22:43:09 UTC (rev 895)
+++ branches/samba4/changelog	2006-01-05 22:50:22 UTC (rev 896)
@@ -1,6 +1,7 @@
 samba (3.9.0+SVN12727-1) UNRELEASED; urgency=low
 
-  * 
+  * Move /usr/lib/samba/setup from samba-common to samba. 
+    * Make samba replace samba-common (<= 3.9.0+SVN12726-1)
 
  -- Steinar H. Gunderson <sesse at debian.org>  Thu,  5 Jan 2006 23:41:19 +0100
 

Modified: branches/samba4/control
===================================================================
--- branches/samba4/control	2006-01-05 22:43:09 UTC (rev 895)
+++ branches/samba4/control	2006-01-05 22:50:22 UTC (rev 896)
@@ -10,6 +10,7 @@
 Architecture: any
 Recommends: swat, ldb-tools
 Depends: ${shlibs:Depends}, samba-common, debconf
+Replaces: samba-common (<= 3.9.0+SVN12726-1)
 Description: LanManager-like file and printer server for Unix (version 4)
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve

Modified: branches/samba4/samba-common.install
===================================================================
--- branches/samba4/samba-common.install	2006-01-05 22:43:09 UTC (rev 895)
+++ branches/samba4/samba-common.install	2006-01-05 22:50:22 UTC (rev 896)
@@ -1,3 +1,2 @@
 usr/lib/samba/*.dat
-usr/lib/samba/setup
 usr/lib/samba/js

Modified: branches/samba4/samba.install
===================================================================
--- branches/samba4/samba.install	2006-01-05 22:43:09 UTC (rev 895)
+++ branches/samba4/samba.install	2006-01-05 22:50:22 UTC (rev 896)
@@ -1,3 +1,4 @@
 usr/sbin/smbd
 usr/bin/smbstatus
 usr/bin/smbscript
+usr/lib/samba/setup