[Pkg-wmaker-commits] [wmmon] 02/12: Import Debian changes 1.0b2-2

Sat Aug 12 22:44:02 UTC 2017

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmmon.

commit 2879bff5568b347a9d4ce651e619ca9625a7c1ca
Author: Fredrik Hallenberg <hallon at debian.org>
Date:   Sat Oct 17 13:35:55 1998 +0200

    Import Debian changes 1.0b2-2
    
    wmmon (1.0b2-2) unstable; urgency=low
    
      * Patch from Salvador Pinto Abreu <spa at sc.uevora.pt>:
        Fixed behavior when APM causes the system to sleep/suspend.
    
    wmmon (1.0b2-1) unstable; urgency=low
    
      * Initial Release.
---
 debian/changelog | 17 ++++++++++++++++
 debian/control   | 27 +++++++++++++++++++++++++
 debian/copyright | 29 +++++++++++++++++++++++++++
 debian/dirs      |  2 ++
 debian/rules     | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 wmmon/wmmon.c    |  3 +++
 6 files changed, 138 insertions(+)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..03c3e5f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,17 @@
+wmmon (1.0b2-2) unstable; urgency=low
+
+  * Patch from Salvador Pinto Abreu <spa at sc.uevora.pt>:
+    Fixed behavior when APM causes the system to sleep/suspend.
+
+ -- Fredrik Hallenberg <hallon at debian.org>  Sat, 17 Oct 1998 13:35:55 +0200
+
+wmmon (1.0b2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Fredrik Hallenberg <hallon at debian.org>  Wed, 15 Jul 1998 18:18:37 +0200
+
+Local variables:
+mode: debian-changelog
+add-log-mailing-address: "hallon at debian.org"
+End:
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..80fd2f4
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,27 @@
+Source: wmmon
+Section: x11
+Priority: optional
+Maintainer: Fredrik Hallenberg <hallon at debian.org>
+Standards-Version: 2.4.1
+
+Package: wmmon
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Monitor CPU load and average system load
+ WMMon monitors the realtime CPU load as well the average
+ system load and gives you some nice additional features too...
+ .
+ WMMon currently provides:
+ .
+   * Realtime CPU 'stress' meter;
+   * Average systemload, like xload & wmavgload;
+   * Average systemload graphic is autoscaling;
+   * Realtime Disk I/O 'stress' meter;
+   * Average Disk I/O load grapic (autoscaling);
+   * Realtime total Mem & Swap usage meters;
+   * System uptime display;
+   * Realtime cycling through all monitor modes;
+   * Can lauch 3 user definable commands through ~/.wmmonrc;
+   * Can be started multiple times;
+   * Commandline options for help (-h), version (-v),
+     start mode (-i & -s) and display (-d);
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..831a3cd
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Fredrik Hallenberg hallon at debian.org on
+Wed, 15 Jul 1998 18:18:37 +0200.
+
+It was downloaded from http://www.xs4all.nl/~warp/files/wmmon-1.0b2.tar.gz
+
+Copyright:
+
+WMMon.app is copyright (c) 1997, 1998 by Martijn Pieterse and
+Antoine Nulle and licensed through the GNU General Public License. 
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/doc/copyright/GPL'.
+
+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..82eb000
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/X11R6/bin
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..955efcd
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,60 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	cd wmmon; $(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp
+
+	-cd wmmon; $(MAKE) clean
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	install -m 755 wmmon/wmmon `pwd`/debian/tmp/usr/X11R6/bin
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
+	dh_testdir
+	dh_testroot
+	dh_installdocs BUGS HINTS INSTALL README TODO
+	dh_undocumented wmmon.1x
+	dh_installchangelogs CHANGES
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
diff --git a/wmmon/wmmon.c b/wmmon/wmmon.c
index 20fdabe..2e1003d 100644
--- a/wmmon/wmmon.c
+++ b/wmmon/wmmon.c
@@ -377,6 +377,9 @@ void wmmon_routine(int argc, char **argv) {
 		if (curtime >= nexttime) {
 			nexttime+=10;
 
+			if (curtime > nexttime) /* dont let APM suspends make this crazy */
+			  nexttime = curtime;
+
 			for (i=0; i<stat_online; i++) {
 				if (stat_device[i].his[54])
 					stat_device[i].his[54] /= stat_device[i].hisaddcnt;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmon.git

