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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-06 17:33:09 +0000 (Fri, 06 Jan 2006)
New Revision: 920

Modified:
   branches/samba4/changelog
   branches/samba4/control
   branches/samba4/samba-common.install
   branches/samba4/samba.install
Log:
Move testparm from samba into samba-common.

  * Make samba-common Architecture: any.
  * Make samba-common replace/conflict samba (<= 3.9.0+SVN12739-1).



Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-06 17:27:40 UTC (rev 919)
+++ branches/samba4/changelog	2006-01-06 17:33:09 UTC (rev 920)
@@ -1,6 +1,8 @@
 samba (3.9.0+SVN12743-1) experimental; urgency=low
 
-  * 
+  * Move testparm from samba into samba-common.
+    * Make samba-common Architecture: any.
+    * Make samba-common replace/conflict samba (<= 3.9.0+SVN12739-1).
 
  -- Steinar H. Gunderson <sesse at debian.org>  Fri,  6 Jan 2006 18:27:09 +0100
 

Modified: branches/samba4/control
===================================================================
--- branches/samba4/control	2006-01-06 17:27:40 UTC (rev 919)
+++ branches/samba4/control	2006-01-06 17:33:09 UTC (rev 920)
@@ -25,7 +25,9 @@
  This package contains smbd, the Samba file, print and domain server.
 
 Package: samba-common
-Architecture: all
+Architecture: any
+Replaces: samba (<= 3.9.0+SVN12739-1)
+Conflicts: samba (<= 3.9.0+SVN12739-1)
 Description: Samba 4 common files used by both the server and the client
  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-06 17:27:40 UTC (rev 919)
+++ branches/samba4/samba-common.install	2006-01-06 17:33:09 UTC (rev 920)
@@ -1,2 +1,3 @@
+usr/bin/testparm
 usr/lib/samba/*.dat
 usr/lib/samba/js

Modified: branches/samba4/samba.install
===================================================================
--- branches/samba4/samba.install	2006-01-06 17:27:40 UTC (rev 919)
+++ branches/samba4/samba.install	2006-01-06 17:33:09 UTC (rev 920)
@@ -2,5 +2,4 @@
 usr/bin/ntlm_auth
 usr/bin/smbstatus
 usr/bin/smbscript
-usr/bin/testparm
 usr/lib/samba/setup