- removed debian subdirectory by request of debian packager (this is a

    special subdir for debian and there is also no point in maintaining it
    when there is a debian package available - so I gladly did this)

2 files changed, 1 insertions, 95 deletions

diff --git a/Makefile.am b/Makefile.am
index 9fb3d01b..5b487289 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,4 +11,4 @@ rsyslogd_SOURCES=syslogd.c pidfile.c template.c outchannel.c stringbuf.c srUtils
 rsyslogd_CPPFLAGS=$(mysql_includes)
 rsyslogd_LDADD=$(mysql_libs) $(zlib_libs) $(pthreads_libs)
 
-EXTRA_DIST = doc/bugs.html doc/features.html doc/generic_design.html doc/history.html doc/how2help.html doc/install.html doc/ipv6.html doc/manual.html doc/property_replacer.html doc/rsyslog_conf.html doc/rsyslog_mysql.html doc/rsyslog_packages.html doc/rsyslog_php_syslog_ng.html doc/rsyslog_recording_pri.html doc/rsyslog_stunnel.html doc/status.html doc/syslog-protocol.html doc/version_naming.html doc/contributors.html redhat/rsyslog.conf redhat/rsyslog.init redhat/rsyslog.log redhat/rsyslog.sysconfig debian/rsyslogd freebsd/rsyslogd slackware/rc.rsyslogd rfc3195d.8 rklogd.8 rsyslogd.8 rsyslog.conf.5 createDB.sql contrib/README contrib/delete_mysql doc/rsconf1_actionexeconlyifpreviousissuspended.html doc/rsconf1_actionresumeinterval.html doc/rsconf1_allowedsender.html doc/rsconf1_controlcharacterescapeprefix.html doc/rsconf1_debugprintcfsyslinehandlerlist.html doc/rsconf1_debugprintmodulelist.html doc/rsconf1_debugprinttemplatelist.html doc/rsconf1_dircreatemode.html doc/rsconf1_dirgroup.html doc/rsconf1_dirowner.html doc/rsconf1_dropmsgswithmaliciousdnsptrrecords.html doc/rsconf1_droptrailinglfonreception.html doc/rsconf1_dynafilecachesize.html doc/rsconf1_escapecontrolcharactersonreceive.html doc/rsconf1_failonchownfailure.html doc/rsconf1_filecreatemode.html doc/rsconf1_filegroup.html doc/rsconf1_fileowner.html doc/rsconf1_includeconfig.html doc/rsconf1_mainmsgqueuesize.html doc/rsconf1_modload.html doc/rsconf1_repeatedmsgreduction.html doc/rsconf1_resetconfigvariables.html doc/rsconf1_umask.html
+EXTRA_DIST = doc/bugs.html doc/features.html doc/generic_design.html doc/history.html doc/how2help.html doc/install.html doc/ipv6.html doc/manual.html doc/property_replacer.html doc/rsyslog_conf.html doc/rsyslog_mysql.html doc/rsyslog_packages.html doc/rsyslog_php_syslog_ng.html doc/rsyslog_recording_pri.html doc/rsyslog_stunnel.html doc/status.html doc/syslog-protocol.html doc/version_naming.html doc/contributors.html redhat/rsyslog.conf redhat/rsyslog.init redhat/rsyslog.log redhat/rsyslog.sysconfig freebsd/rsyslogd slackware/rc.rsyslogd rfc3195d.8 rklogd.8 rsyslogd.8 rsyslog.conf.5 createDB.sql contrib/README contrib/delete_mysql doc/rsconf1_actionexeconlyifpreviousissuspended.html doc/rsconf1_actionresumeinterval.html doc/rsconf1_allowedsender.html doc/rsconf1_controlcharacterescapeprefix.html doc/rsconf1_debugprintcfsyslinehandlerlist.html doc/rsconf1_debugprintmodulelist.html doc/rsconf1_debugprinttemplatelist.html doc/rsconf1_dircreatemode.html doc/rsconf1_dirgroup.html doc/rsconf1_dirowner.html doc/rsconf1_dropmsgswithmaliciousdnsptrrecords.html doc/rsconf1_droptrailinglfonreception.html doc/rsconf1_dynafilecachesize.html doc/rsconf1_escapecontrolcharactersonreceive.html doc/rsconf1_failonchownfailure.html doc/rsconf1_filecreatemode.html doc/rsconf1_filegroup.html doc/rsconf1_fileowner.html doc/rsconf1_includeconfig.html doc/rsconf1_mainmsgqueuesize.html doc/rsconf1_modload.html doc/rsconf1_repeatedmsgreduction.html doc/rsconf1_resetconfigvariables.html doc/rsconf1_umask.html
diff --git a/debian/rsyslogd b/debian/rsyslogd
deleted file mode 100755
index 40bfaac7..00000000
--- a/debian/rsyslogd
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# /etc/init.d/rsyslogd: start the rsyslogd system log daemon.
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-pidfile=/var/run/rsyslogd.pid
-binpath=/usr/sbin/rsyslogd
-
-test -x $binpath || exit 0
-
-# Options for start/restart the daemons
-#   For remote UDP logging use SYSLOGD="-r 0"
-#   For relaying add "-h" to SYSLOGD
-#
-SYSLOGD=""
-
-create_xconsole()
-{
-    if [ ! -e /dev/xconsole ]; then
-	mknod -m 640 /dev/xconsole p
-    else
-	chmod 0640 /dev/xconsole
-    fi
-    chown root.adm /dev/xconsole
-}
-
-running()
-{
-    # No pidfile, probably no daemon present
-    #
-    if [ ! -f $pidfile ]
-    then
-	return 1
-    fi
-
-    pid=`cat $pidfile`
-
-    # No pid, probably no daemon present
-    #
-    if [ -z "$pid" ]
-    then
-	return 1
-    fi
-
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -1`
-
-    # No syslogd?
-    #
-    if [ "$cmd" != "$binpath" ]
-    then
-	return 1
-    fi
-
-    return 0
-}
-
-case "$1" in
-  start)
-    echo -n "Starting system log daemon: rsyslogd"
-    create_xconsole
-    start-stop-daemon --start --quiet --exec $binpath -- $SYSLOGD
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping system log daemon: rsyslogd"
-    start-stop-daemon --stop --exec $binpath --pidfile $pidfile
-    echo "."
-    ;;
-  reload|force-reload)
-    start-stop-daemon --stop --quiet --signal 1 --exec $binpath --pidfile $pidfile
-    ;;
-  restart)
-    echo -n "Stopping system log daemon: rsyslogd"
-    start-stop-daemon --stop --quiet --exec $binpath --pidfile $pidfile
-    echo "."
-    sleep 1
-    echo -n "Starting system log daemon: rsyslogd"
-    start-stop-daemon --start --quiet --exec $binpath -- $SYSLOGD
-    echo "."
-    ;;
-  reload-or-restart)
-    if running
-    then
-	start-stop-daemon --stop --quiet --signal 1 --exec $binpath --pidfile $pidfile
-    else
-	start-stop-daemon --start --quiet --exec $binpath -- $SYSLOGD
-    fi
-    ;;
-  *)
-    echo "Usage: /etc/init.d/rsyslogd {start|stop|reload|restart|force-reload|reload-or-restart}"
-    exit 1
-esac
-
-exit 0