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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-03 17:30:48 +0000 (Tue, 03 Jan 2006)
New Revision: 850

Added:
   branches/samba4/swat.install
Removed:
   branches/samba4/samba-swat.install
Modified:
   branches/samba4/changelog
   branches/samba4/control
Log:
Rename samba-swat to swat, and add a dependency from swat to samba.


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-03 16:55:53 UTC (rev 849)
+++ branches/samba4/changelog	2006-01-03 17:30:48 UTC (rev 850)
@@ -16,9 +16,10 @@
     * 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. 
+  * Make samba-client Replaces/Conflicts smbclient.
+  * Rename samba-swat to swat, and add a dependency from swat to samba.
 
- -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 16:48:57 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 18:29:10 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 

Modified: branches/samba4/control
===================================================================
--- branches/samba4/control	2006-01-03 16:55:53 UTC (rev 849)
+++ branches/samba4/control	2006-01-03 17:30:48 UTC (rev 850)
@@ -61,7 +61,7 @@
  
 Package: samba
 Architecture: any
-Recommends: samba-swat
+Recommends: swat
 Depends: ${shlibs:Depends}, samba-common, debconf
 Description: LanManager-like file and printer server for Unix (version 4)
  The Samba software suite is a collection of programs that
@@ -168,8 +168,9 @@
  are primarily useful for debugging and developing Samba or other
  applications using LDB.
 
-Package: samba-swat
+Package: swat
 Architecture: all
+Depends: samba (=${Source-Version})
 Description: data files for SWAT
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve

Deleted: branches/samba4/samba-swat.install
===================================================================
--- branches/samba4/samba-swat.install	2006-01-03 16:55:53 UTC (rev 849)
+++ branches/samba4/samba-swat.install	2006-01-03 17:30:48 UTC (rev 850)
@@ -1 +0,0 @@
-usr/share/samba/swat

Copied: branches/samba4/swat.install (from rev 833, branches/samba4/samba-swat.install)