[Pkg-wmaker-commits] [wmload] 03/58: Imported Debian patch 0.9.2-6
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 23:36:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmload.
commit c2511c2a8fb415422e2d40fd4cbeebe19c89ebab
Author: Josip Rodin <jrodin at jagor.srce.hr>
Date: Sat Dec 25 17:39:09 1999 +0100
Imported Debian patch 0.9.2-6
---
Imakefile | 6 ++---
debian/README.debian | 7 -----
debian/changelog | 19 ++++++++++++-
debian/control | 18 ++++++++-----
debian/copyright | 20 +++++++++-----
debian/dirs | 3 ---
debian/docs | 1 -
debian/menu | 8 ++----
debian/postinst | 17 ------------
debian/postrm | 28 --------------------
debian/rules | 75 ++++++++++++++++++----------------------------------
debian/wmload.1x | 61 ------------------------------------------
wmload.c | 4 +++
wmload.man | 52 ++++++++++++++++++++++++++++++++++++
14 files changed, 130 insertions(+), 189 deletions(-)
diff --git a/Imakefile b/Imakefile
index d91cbce..cfa7ed3 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,8 +1,6 @@
-/* installation directory is the combination of $(DESTDIR) and $(BINDIR)*/
-DESTDIR = /usr/local
-BINDIR = /bin
+/* installation directory is "BINDIR = /usr/X11R6/bin" by default */
-XPMLIB = -L/usr/lib/X11 -lXpm -lm
+XPMLIB = -L/usr/X11R6/lib -lXpm -lm
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
diff --git a/debian/README.debian b/debian/README.debian
deleted file mode 100644
index 417e048..0000000
--- a/debian/README.debian
+++ /dev/null
@@ -1,7 +0,0 @@
-wmload for DEBIAN
------------------
-
-This is Debian GNU/Linux's prepackaged version of wmload, a system load
-monitor designed for WindowMaker.
-
-Marcelo E. Magallon <mmagallo at efis.ucr.ac.cr>, Fri, 2 Jan 1998 13:42:00 -0600
diff --git a/debian/changelog b/debian/changelog
index 1aa8b2a..3aac9b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+wmload (0.9.2-6) unstable; urgency=low
+
+ * NMU... no, MU... uh, no, NMU... :) Returning maintainership to
+ Marcelo with this upload.
+ * Fixed the copyright file (doh!).
+ * Fixed Imakefile, usage of wmload.1x, rules (in sync with wmavgload).
+ * Included some headers in wmload.c to make it compile warningless.
+
+ -- Josip Rodin <jrodin at jagor.srce.hr> Sat, 25 Dec 1999 17:39:09 +0100
+
+wmload (0.9.2-5) unstable; urgency=low
+
+ * New maintainer.
+ * Redid the packaging, using debhelper. Updated for Policy 3.x.
+ * Beautified description and the manual page. Suggest wmavgload.
+
+ -- Josip Rodin <jrodin at jagor.srce.hr> Tue, 28 Sep 1999 19:45:28 +0200
+
wmload (0.9.2-4) frozen unstable; urgency=low
* Wrote a real manpage
@@ -26,5 +44,4 @@ wmload (0.9.2-1) unstable; urgency=low
Local variables:
mode: debian-changelog
mode: auto-fill
-add-log-mailing-address: "mmagallo at debian.org"
End:
diff --git a/debian/control b/debian/control
index 494b975..203e113 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,19 @@
Source: wmload
Section: x11
Priority: optional
-Maintainer: Marcelo E. Magallon <mmagallo at debian.org>
-Standards-Version: 2.4.0.0
+Maintainer: Marcelo Magallon <mmagallo at debian.org>
+Build-Depends: libxpm4-dev
+Standards-Version: 3.1.1
Package: wmload
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: wmaker
-Description: A system load monitor designed for WindowMaker
- There's nothing in the program that makes it requiere WindowMaker, except
- maybe the look.
+Suggests: wmaker, wmavgload
+Description: system load monitor designed for Window Maker
+ wmload displays a graphical representation of the kernel/system
+ statistics on a 64x64 miniwindow. There are three shades in the
+ window: the light one, which corresponds to user statistics, second
+ is the nice time statistics, and the darkest one is system statistics.
+ .
+ It works with other window managers, since there isn't actually anything
+ in the program to make it require Window Maker, except maybe the look.
diff --git a/debian/copyright b/debian/copyright
index 61ce1fe..5a162b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,16 @@
-This package was debianized by Marcelo E. Magallon
-<mmagallo at efis.ucr.ac.cr> on Fri, 2 Jan 1998 13:42:00 -0600.
+wmload was first debianized by Marcelo E. Magallon on 2 January 1998.
+Later it was maintained by Josip Rodin <jrodin at jagor.srce.hr>.
-wmmixer by Sam Hawker, shawkie at geocities.com
-http://www.geocities.com/SiliconValley/Vista/2471/
+Copyright (C) 1996 Beat Christen <bchriste at iiic.ethz.ch> (asload)
+Copyright (C) 1997 Ryan Land <rland at bc1.com>
-this software is freely distributable and supplied without warranty
-(express or otherwise)
+ As usual, this software is bound by the GNU General Public License.
+ You can use it however you see fit, as long as all the README's
+ accompany any copy/version of it.
+
+ THE KIND SOLES WHO HAVE WRITTEN/CONTRIBUTED TO THIS SOFTWARE, IN NO
+ WAY ACCEPT LIABILITY OR ANY RESPONSIBILITY FOR THE USE OF, OR FOR
+ ANY CONSEQUENCES RESULTING FROM THE USE OF THIS SOFTWARE.
+
+See the `/usr/share/common-licenses/GPL' file for the complete text
+of the GNU General Public License.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index fa46ee0..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/X11R6/bin
-usr/doc/wmload
-usr/lib/menu
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/menu b/debian/menu
index cb9ffeb..4e9858a 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,6 +1,2 @@
-?package(wmload):\
- needs="x11"\
- icon="none"\
- section="Apps/System"\
- title="WMload"\
- command="/usr/X11R6/bin/wmload -shape -withdrawn"
+?package(wmload): needs=X11 section="Apps/System" title="wmload" \
+ command="/usr/bin/X11/wmload -shape -withdrawn"
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 880a2cb..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- configure)
- [ -x /usr/bin/update-menus ] && update-menus
- ;;
-
- abort-upgrade|abort-deconfigure|abort-remove)
- # how did we got here? Force a non-zero exit code
- exit 1
- ;;
- *)
- echo "postinst called with unkown argument: \$1" >&2
- ;;
-esac
-
-exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 6e15de6..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- remove)
- [ -x /usr/bin/update-menus ] && update-menus
- ;;
- purge)
- ;;
- upgrade)
- # nothing to do
- ;;
- failed-upgrade)
- # this is an upgrade, and it has failed. What can fail?
- exit 1
- ;;
- abort-install)
- ;;
- abort-upgrade)
- ;;
- disappear)
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/rules b/debian/rules
index c0da576..376b75b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,63 +1,40 @@
#!/usr/bin/make -f
+# Derived from Marcelo's and dh_make's rules files.
-package=wmload
-
-SHELL=/bin/sh
-
-export DH_VERBOSE = 1
+#export DH_VERBOSE=1
build: build-stamp
-
build-stamp:
dh_testdir
- xmkmf -a
- $(MAKE)
- touch build-stamp
+ xmkmf
+ $(MAKE) CDEBUGFLAGS="-g -O2 -Wall -fno-strength-reduce"
+ touch $@
clean:
dh_testdir
dh_testroot
- -make clean
- -rm -f build-stamp Makefile
- dh_clean
+ [ ! -f Makefile ] || $(MAKE) clean
+ dh_clean build-stamp Makefile
-binary-indep: build
-# dh_testdir -i
-# dh_testroot
-# dh_clean -i -k
+binary-indep:
+# There aren't any architecture-independent files here.
binary-arch: build
- dh_testdir -a
+ dh_testdir
dh_testroot
- dh_clean -a -k
- dh_installdirs -a
- install -m 755 -s wmload debian/tmp/usr/X11R6/bin/wmload
- dh_installdocs -a
- dh_installmenu -a
- dh_installmanpages -a
- dh_installchangelogs -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a -u-isp
- dh_makeshlibs -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean build
-
-# Local variables:
-# mode: makefile
-# mode: font-lock
-# End:
-
-
-
-
-
-
-
+ dh_clean -k
+ $(MAKE) install install.man DESTDIR=`pwd`/debian/tmp
+ dh_installdocs README
+ dh_installchangelogs
+ dh_installmenu
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
diff --git a/debian/wmload.1x b/debian/wmload.1x
deleted file mode 100644
index 8173118..0000000
--- a/debian/wmload.1x
+++ /dev/null
@@ -1,61 +0,0 @@
-.\" This is -*- nroff -*- ... ugh! The computer made me do it
-.TH wmload 1x "8 Apr 1998" "Debian Project" "Debian GNU/Linux"
-.SH NAME
-wmload \- Graphically display the kernel/system statistics
-.SH SYNOPSIS
-.B wmload
-.RB [\| \-u \|
-.IR \| <secs> \|]
-.RB [\| \-e
-.IR \| <program> \|]
-.RB [\| \-l
-.IR \| <color> \|]
-.RB [\| \-p\|
-.RB [+|\-]\|x\|[+|\-]\|y\|]
-.RB [\| \-s \|]
-.RB [\| \-i \|]
-.RB [\| \-w \|]
-.RB [\| \-v \|]
-.SH DESCRIPTION
-\fBwmload\fP displays a graphical representation of the kernel/system
-statistics on a 64x64 miniwindow. The are three shades on the window:
-the light one corresponds to \fIuser\fP statistics, the next one is
-\fInice time\fP statistics and the darker one is \fIsystem\fP
-statistics.
-.SH OPTIONS
-.TP
-.B \-u <secs>
-updatespeed
-.TP
-.B \-e <program>
-program to start on click
-.TP
-.B \-p [+|-]x[+|-]y
-position of wmload
-.TP
-.B \-s
-without groundplate
-.TP
-.B \-i
-start up as icon
-.TP
-.B \-w
-start up withdrawn
-.TP
-.B \-v
-output version
-.SH FILES
-.I /proc/stat
-kernel/system statistics and other information
-.SH AUTHORS
-\fBwmload\fP by Ryan \fILand <rand at bc1.com>\fP based on asload by
-\fIBeat Christen <bchriste at iiic.ethz.ch>\fP
-
-This manpange was written by \fIMarcelo Magallon
-<mmagallo at debian.org\fP for the \fIDebian Project\fP
-.SH "SEE ALSO"
-.BR ps (1),
-.BR tload (1),
-.BR top (1),
-.BR uptime (5),
-.BR w (1)
diff --git a/wmload.c b/wmload.c
index cad9970..6b006d2 100644
--- a/wmload.c
+++ b/wmload.c
@@ -1,4 +1,8 @@
#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
#include <X11/Xlib.h>
#include <X11/xpm.h>
#include <X11/extensions/shape.h>
diff --git a/wmload.man b/wmload.man
new file mode 100644
index 0000000..b28f39e
--- /dev/null
+++ b/wmload.man
@@ -0,0 +1,52 @@
+.\" This is -*- nroff -*- ... ugh! The computer made me do it
+.TH WMLOAD 1x "September 1999" "Debian Project" "WMLoad"
+.SH NAME
+wmload \- graphically display the kernel/system statistics
+.SH SYNOPSIS
+.B wmload
+[ -u <secs> ] [ -e <program> ] [ -l <color> ]
+[ -p [+|-]x [+|-]y ] [ -s ] [ -i ] [ -w ] [ -v ]
+.SH DESCRIPTION
+\fBwmload\fP displays a graphical representation of the kernel/system
+statistics on a 64x64 miniwindow. There are three shades in the window:
+the light one, which corresponds to \fIuser\fP statistics, second is
+the \fInice time\fP statistics, and the darkest one is \fIsystem\fP
+statistics.
+.SH OPTIONS
+.TP
+.I -u <secs>
+updatespeed
+.TP
+.I -e <program>
+program to start on click
+.TP
+.I -p [+|-]x[+|-]y
+position of wmload
+.TP
+.I -s
+without groundplate
+.TP
+.I -i
+start up as icon
+.TP
+.I -w
+start up withdrawn
+.TP
+.I -v
+output version
+.SH FILES
+.TP
+.I /proc/stat
+kernel/system statistics and other information
+.SH AUTHORS
+.B wmload
+was written by Ryan Land <rand at bc1.com>, based on asload by Beat Christen
+<bchriste at iiic.ethz.ch>.
+.sp
+This manpage was written by Marcelo Magallon <mmagallo at debian.org>.
+.SH "SEE ALSO"
+.BR ps (1),
+.BR tload (1),
+.BR top (1),
+.BR uptime (5),
+.BR w (1).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmload.git
More information about the Pkg-wmaker-commits
mailing list