diff -u gkrellm-2.3.1/debian/rules gkrellm-2.3.1/debian/rules --- gkrellm-2.3.1/debian/rules +++ gkrellm-2.3.1/debian/rules @@ -49,7 +49,7 @@ rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + [ ! -f Makefile ] || $(MAKE) clean dh_clean reverted: --- gkrellm-2.3.1/server/gkrellmd.conf.new +++ gkrellm-2.3.1.orig/server/gkrellmd.conf.new @@ -1,103 +0,0 @@ -# Sample config file for the GKrellM server gkrellmd - -# The server update frequency is independent of and should be less than -# the client update frequency. Values may be from 1 to 10 and should be -# smaller values to reduce network traffic. -# -update-hz 3 - -# Limit number of simultaneous clients allowed to connect. -# -max-clients 2 - -# Specify a specific network interface to listen on for connections. -# By default gkrellmd listens on all available network interfaces. -# -address 127.0.0.1 - -# Specify the port to listen on for connections. -# -port 19150 - -# List of hosts allowed to connect. If no hosts are specified in a -# gkrellmd.conf file or on the command line, all hosts will be allowed. -# -allow-host localhost -allow-host 127.0.0.1 -allow-host ::ffff:127.0.0.1 -#allow-host ::1 -#allow-host 192.168.0.* - -# Drop privileges after startup (you must start gkrellmd as root to do it). -# -user nobody -group proc - -# Create a PID file for the running gkrellmd. Default is no PID file. -#pidfile /var/run/gkrellmd.pid - -# Run in background and detach from the controlling terminal -detach - -# Time interval between checks for various monitors. If nfs-interval -# is <= 0 then gkrellmd will not read data for nfs file system types. -# -#fs-interval 2 -#nfs-interval 16 - -# The Internet monitor defaults to reading tcp connections once per second. -# However, for Linux SMP kernels where reading /proc/net/tcp causes high -# cpu usage, the inet-interval may be set to 1-20 seconds to slow down -# /proc/net/tcp reads. Or set it to 0 to totally disable the Inet monitor. -# Requires at least gkrellmd version 2.1.8. -# -#inet-interval 1 - -# If the mbmon daemon is started before gkrellmd with this command: -# mbmon -r -P port-number -# (the "-r" mbmon tag mode is required) then gkrellmd will monitor mbmon -# reported sensors if this is uncommented and the port-numbers match. -# -#mbmon-port port-number - -# Configure gkrellm clients to disconnect from a gkrellmd server if -# there is an io-timeout seconds interval where the client receives no input -# from the server. Use this for conditions where gkrellmd may be -# ungracefully terminated such that socket connections are not closed. -# Minimum is 2 (less than 2 for no I/O disconnecting and is the default). -# Requires at least 2.1.8 versions of both gkrellmd and gkrellm. -# -#io-timeout 5 - -# Configure gkrellm clients to attempt automatic reconnects to a -# gkrellmd server every reconnect-timeout seconds after a disconnected -# state is detected. Disconnected states are created by normal gkrellmd -# shutdowns or by an expiring io-timeout. -# Minimum is 2 (less than 2 for no automatic reconnecting and is the default). -# Requires at least 2.1.8 versions of both gkrellmd and gkrellm. -# -#reconnect-timeout 5 - -# Server side local mailbox counts can be sent to gkrellm clients. List here -# paths to mbox, MH mail, or Maildir style mailboxes. -# Requires at least 2.1.11 versions of both gkrellmd and gkrellm. -# -#mailbox /var/mail/bill -#mailbox ~/Mail/inbox - -# List of plugins to enable. Use "gkrellmd -plist" to view a list of all -# available plugins. Use "gkrellmd -plog" to output a log of the plugin -# install process (note: the detach option is ignored when using -plog). -# -#plugin-enable gkrelltopd -#plugin-enable gkrellmwho2d - -# Configure gkrellmd to send the connect time for a network interface -# to all clients to be displayed in the client gkrellm timer button -# monitor display. If this is done, the client gkrellm timer button can -# still execute commands on the client, but the button will not affect the -# timer display. If you want the client timer button to execute commands -# on the server, your timer button commands can use ssh. -# So set this if your server box has a ppp or ippp connection and you -# want to monitor its connect time. -#net-timer ppp0