r8384: merging clutter fixes from release branch

(This used to be commit cbe74c09109dcfe93aa4af085920999ccbff34df)

diff --git a/examples/genlogon/genlogon.pl b/examples/logon/genlogon/genlogon.pl
similarity index 100%
rename from examples/genlogon/genlogon.pl
rename to examples/logon/genlogon/genlogon.pl

diff --git a/examples/mklogon/mklogon.conf b/examples/logon/mklogon/mklogon.conf
similarity index 100%
rename from examples/mklogon/mklogon.conf
rename to examples/logon/mklogon/mklogon.conf

diff --git a/examples/mklogon/mklogon.pl b/examples/logon/mklogon/mklogon.pl
similarity index 100%
rename from examples/mklogon/mklogon.pl
rename to examples/logon/mklogon/mklogon.pl

diff --git a/examples/ntlogon/README b/examples/logon/ntlogon/README
similarity index 100%
rename from examples/ntlogon/README
rename to examples/logon/ntlogon/README

diff --git a/examples/ntlogon/ntlogon.conf b/examples/logon/ntlogon/ntlogon.conf
similarity index 100%
rename from examples/ntlogon/ntlogon.conf
rename to examples/logon/ntlogon/ntlogon.conf

diff --git a/examples/ntlogon/ntlogon.py b/examples/logon/ntlogon/ntlogon.py
similarity index 100%
rename from examples/ntlogon/ntlogon.py
rename to examples/logon/ntlogon/ntlogon.py

diff --git a/examples/scripts/backtrace b/examples/scripts/debugging/linux/backtrace
similarity index 100%
rename from examples/scripts/backtrace
rename to examples/scripts/debugging/linux/backtrace

diff --git a/examples/debugging/README b/examples/scripts/debugging/solaris/README
similarity index 100%
rename from examples/debugging/README
rename to examples/scripts/debugging/solaris/README

diff --git a/examples/debugging/solaris-oops.sh b/examples/scripts/debugging/solaris/solaris-oops.sh
similarity index 100%
rename from examples/debugging/solaris-oops.sh
rename to examples/scripts/debugging/solaris/solaris-oops.sh

diff --git a/examples/scripts/perl/smbaddprinter.pl b/examples/scripts/printing/cups/smbaddprinter.pl
similarity index 100%
rename from examples/scripts/perl/smbaddprinter.pl
rename to examples/scripts/printing/cups/smbaddprinter.pl

diff --git a/examples/scripts/perl/smbdelprinter.pl b/examples/scripts/printing/cups/smbdelprinter.pl
similarity index 100%
rename from examples/scripts/perl/smbdelprinter.pl
rename to examples/scripts/printing/cups/smbdelprinter.pl

diff --git a/examples/scripts/perl/modify_samba_config.pl b/examples/scripts/shares/perl/modify_samba_config.pl
similarity index 100%
rename from examples/scripts/perl/modify_samba_config.pl
rename to examples/scripts/shares/perl/modify_samba_config.pl

diff --git a/examples/scripts/python/SambaConfig.py b/examples/scripts/shares/python/SambaConfig.py
similarity index 100%
rename from examples/scripts/python/SambaConfig.py
rename to examples/scripts/shares/python/SambaConfig.py

diff --git a/examples/scripts/python/SambaParm.py b/examples/scripts/shares/python/SambaParm.py
similarity index 100%
rename from examples/scripts/python/SambaParm.py
rename to examples/scripts/shares/python/SambaParm.py

diff --git a/examples/scripts/python/generate_parm_table.py b/examples/scripts/shares/python/generate_parm_table.py
similarity index 100%
rename from examples/scripts/python/generate_parm_table.py
rename to examples/scripts/shares/python/generate_parm_table.py

diff --git a/examples/scripts/python/modify_samba_config.py b/examples/scripts/shares/python/modify_samba_config.py
similarity index 100%
rename from examples/scripts/python/modify_samba_config.py
rename to examples/scripts/shares/python/modify_samba_config.py

diff --git a/examples/scripts/python/smbparm.py b/examples/scripts/shares/python/smbparm.py
similarity index 100%
rename from examples/scripts/python/smbparm.py
rename to examples/scripts/shares/python/smbparm.py

diff --git a/examples/svr4-startup/README b/examples/svr4-startup/README
deleted file mode 100644 (file)
index 8ed9f74..0000000
--- a/examples/svr4-startup/README
+++ /dev/null
@@ -1,24 +0,0 @@
-Hi and thanks for this great software.
-
-Solaris (and other sysv) machines have a standardized way of
-starting and shutting down services (you may well know that already).
-
-Here's a piece of code one could place under /etc/init.d
-and create appropriate link from, say
-
-   /etc/rc2.d/S99samba.server
-
-to make smbd start and stop automatically with system bootups and
-shutdowns. Each one should edit the lines containing the
-daemon calls to agree with his/her installation (the code below
-works with the defaults) and workgroup  setup (we use the -G and -n
-options).
-
-
-I hope this will be of use --- at least it is for me.
-
-Yours,
-
-Timo Knuutila
-knuutila@cs.utu.fi
-

diff --git a/examples/svr4-startup/samba.server b/packaging/sysv/samba.init
similarity index 85%
rename from examples/svr4-startup/samba.server
rename to packaging/sysv/samba.init
index 0a47fdb10ce623ed061fd67260beb9820bf9313f..e021e911f6be75e70a81bf22d6d5550d267e07ea 100755 (executable)
--- a/examples/svr4-startup/samba.server
+++ b/packaging/sysv/samba.init
@@ -1,7 +1,6 @@
 #!/bin/sh
-#ident  "@(#)samba.server 1.0   96/06/19 TK"    /* SVr4.0 1.1.13.1*/
 #
-# Please send info on modifications to knuutila@cs.utu.fi
+# Copyright (c) Timo Knuutila <knuutila@cs.utu.fi>     1996.
 #
 # This file should have uid root, gid sys and chmod 744
 #