[Pkg-samba-maint] r1103 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-08-04 00:16:16 +0000 (Fri, 04 Aug 2006)
New Revision: 1103

Removed:
   trunk/swat.config
   trunk/swat.templates
Modified:
   trunk/changelog
   trunk/control
   trunk/control.in
   trunk/swat.postinst
Log:
Removed unwanted swat debconf warning


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-08-03 23:43:19 UTC (rev 1102)
+++ trunk/changelog	2006-08-04 00:16:16 UTC (rev 1103)
@@ -61,6 +61,7 @@
     Closes: #307257
   * Python transition preparations: renamed package to python-samba,
     removed hardcoded references to Python version 2.3. Closes: #380939
+  * Removed unwanted swat debconf warning
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 23 Jul 2006 18:50:35 +0200
 

Modified: trunk/control
===================================================================
--- trunk/control	2006-08-03 23:43:19 UTC (rev 1102)
+++ trunk/control	2006-08-04 00:16:16 UTC (rev 1103)
@@ -84,6 +84,10 @@
  .
  This package contains the components of the Samba suite that are needed
  for Web administration of the Samba server.
+ .
+ SWAT will rewrite the smb.conf file. It will rearrange the entries and
+ delete all comments, include= and copy= options. If you use a carefully
+ crafted smb.conf, you should probably avoid using SWAT.
 
 Package: samba-doc
 Section: doc

Modified: trunk/control.in
===================================================================
--- trunk/control.in	2006-08-03 23:43:19 UTC (rev 1102)
+++ trunk/control.in	2006-08-04 00:16:16 UTC (rev 1103)
@@ -84,6 +84,10 @@
  .
  This package contains the components of the Samba suite that are needed
  for Web administration of the Samba server.
+ .
+ SWAT will rewrite the smb.conf file. It will rearrange the entries and
+ delete all comments, include= and copy= options. If you use a carefully
+ crafted smb.conf, you should probably avoid using SWAT.
 
 Package: samba-doc
 Section: doc

Deleted: trunk/swat.config
===================================================================
--- trunk/swat.config	2006-08-03 23:43:19 UTC (rev 1102)
+++ trunk/swat.config	2006-08-04 00:16:16 UTC (rev 1103)
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-#
-#
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-db_title "Samba Web Administration Tool (SWAT)"
-
-db_input medium swat/smb_conf_warn || true
-db_go

Modified: trunk/swat.postinst
===================================================================
--- trunk/swat.postinst	2006-08-03 23:43:19 UTC (rev 1102)
+++ trunk/swat.postinst	2006-08-04 00:16:16 UTC (rev 1103)
@@ -3,9 +3,6 @@
 action="$1"
 oldversion="$2"
 
-# Needed to run the .config script even if we don't use debconf'
-. /usr/share/debconf/confmodule
-
 # Set up swat, turned off by default.
 update-inetd --group OTHER --add \
  'swat\t\tstream\ttcp\tnowait.400\troot\t/usr/sbin/tcpd\t/usr/sbin/swat'

Deleted: trunk/swat.templates
===================================================================
--- trunk/swat.templates	2006-08-03 23:43:19 UTC (rev 1102)
+++ trunk/swat.templates	2006-08-04 00:16:16 UTC (rev 1103)
@@ -1,6 +0,0 @@
-Template: swat/smb_conf_warn
-Type: note
-_Description: Configuration file rewritten by SWAT
- SWAT will rewrite the smb.conf file. It will rearrange the entries and
- delete all comments, include= and copy= options. If you use a carefully
- crafted smb.conf, you should probably avoid using SWAT.