--- wmcpu-1.4.orig/debian/patches/wmcpu-display.diff +++ wmcpu-1.4/debian/patches/wmcpu-display.diff @@ -0,0 +1,69 @@ +diff -urN wmcpu-1.4.orig/wmcpu.c wmcpu-1.4/wmcpu.c +--- wmcpu-1.4.orig/wmcpu.c 2007-01-03 15:14:44.000000000 +0530 ++++ wmcpu-1.4/wmcpu.c 2007-01-03 15:37:14.000000000 +0530 +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + + #include + #include +@@ -45,7 +44,7 @@ + "usage:\n" \ + "\t-display \n" \ + "\t-h\tthis screen\n" \ +- "\t-v\tprint the version number\n" \ ++ "\t-v\tprint the version number and exit\n" \ + "\t-l\tshow load as numbers\n" \ + "\t-t\ttime between refresh in usec (def=250000)\n" + +@@ -65,31 +64,25 @@ + + int main(int argc, char **argv) + { +- int ch; +- +- while ((ch = getopt(argc, argv, "d:hvlt:")) != EOF) { +- switch (ch) { +- case 'd': +- if (optarg) +- display_name = strdup(optarg); +- break; +- case 'v': +- fprintf(stdout, "%s\n", WMCPU_VERSION); +- exit(0); +- break; +- case 'l': +- gfx_loadbar = 0; +- break; +- case 't': +- if (optarg) +- udelay = atol(optarg); +- break; +- default: +- fputs(HELP_TEXT, stdout); +- exit(0); +- break; ++ int par = 1; ++ while( par < argc ) { ++ if( !strcmp( argv[par], "-display" ) && par+1 < argc ) ++ display_name = argv[++par]; ++ else if( !strcmp( argv[par], "-v" ) ) { ++ fprintf(stderr, "%s\n", WMCPU_VERSION); ++ exit(0); ++ } else if( !strcmp( argv[par], "-l" ) ) ++ gfx_loadbar = 0; ++ else if( !strcmp( argv[par], "-t" ) && par+1 < argc ) ++ udelay = atol(argv[++par]); ++ else { ++ fputs(HELP_TEXT, stdout); ++ exit(0); + } ++ ++ ++par; + } ++ + + if ((display = XOpenDisplay(display_name)) == NULL) { + fprintf(stderr, "Unable to open display \"%s\"\n", display_name); --- wmcpu-1.4.orig/debian/patches/Makefile.diff +++ wmcpu-1.4/debian/patches/Makefile.diff @@ -0,0 +1,29 @@ +Index: wmcpu-1.4/Makefile +=================================================================== +--- wmcpu-1.4.orig/Makefile 2007-01-03 12:40:23.000000000 +0100 ++++ wmcpu-1.4/Makefile 2007-01-03 12:42:14.000000000 +0100 +@@ -2,12 +2,13 @@ + CFLAGS = -O3 -Wall + #DEBUG FLAGS HERE: + #CFLAGS += -g -ggdb +-LDFLAGS = -L/usr/X11R6/lib -lXpm -lXext -lX11 ++LDFLAGS = -L/usr/X11R6/lib ++LOADLIBES = -lXpm -lXext -lX11 + OBJS = wmcpu.o + + # where to install this program (also for packaging stuff) + DESTDIR = +-PREFIX = $(DESTDIR)/usr/X11R6 ++PREFIX = $(DESTDIR)/usr + INSTALL = -m 755 + + .PHONY: all clean +@@ -15,7 +16,7 @@ + all: wmcpu + + wmcpu: $(OBJS) +- $(CC) $(CFLAGS) -o wmcpu $(OBJS) $(LDFLAGS) ++ $(CC) $(CFLAGS) -o wmcpu $(OBJS) $(LOADLIBES) $(LDFLAGS) + + clean: + rm -rf *.o wmcpu *~ --- wmcpu-1.4.orig/debian/patches/series +++ wmcpu-1.4/debian/patches/series @@ -0,0 +1,4 @@ +Makefile.diff +wmcpu-display.diff +wmcpu-geometry.diff + --- wmcpu-1.4.orig/debian/patches/wmcpu-geometry.diff +++ wmcpu-1.4/debian/patches/wmcpu-geometry.diff @@ -0,0 +1,40 @@ +diff -urN wmcpu-1.4.orig/wmcpu.c wmcpu-1.4/wmcpu.c +--- wmcpu-1.4.orig/wmcpu.c 2007-01-03 15:39:58.000000000 +0530 ++++ wmcpu-1.4/wmcpu.c 2007-01-03 15:42:01.000000000 +0530 +@@ -43,6 +43,7 @@ + " timecop@japan.co.jp\n" \ + "usage:\n" \ + "\t-display \n" \ ++ "\t-geometry \n" \ + "\t-h\tthis screen\n" \ + "\t-v\tprint the version number and exit\n" \ + "\t-l\tshow load as numbers\n" \ +@@ -57,6 +58,7 @@ + static Pixmap mask; + static unsigned long udelay = 250000; + static int gfx_loadbar = 1; ++static char* geometry = NULL; + + static void wmcpu_routine(void); + static void redraw_window(void); +@@ -68,6 +70,8 @@ + while( par < argc ) { + if( !strcmp( argv[par], "-display" ) && par+1 < argc ) + display_name = argv[++par]; ++ else if( !strcmp( argv[par], "-geometry" ) && par+1 < argc ) ++ geometry = argv[++par]; + else if( !strcmp( argv[par], "-v" ) ) { + fprintf(stderr, "%s\n", WMCPU_VERSION); + exit(0); +@@ -348,6 +352,11 @@ + sizehints.width = width; + sizehints.height = height; + ++ if( geometry ) { ++ XParseGeometry( geometry, &sizehints.x, &sizehints.y, ++ &sizehints.width, &sizehints.height ); ++ } ++ + fg = BlackPixel(display, DefaultScreen(display)); + bg = WhitePixel(display, DefaultScreen(display)); + --- wmcpu-1.4.orig/debian/control +++ wmcpu-1.4/debian/control @@ -0,0 +1,20 @@ +Source: wmcpu +Section: x11 +Priority: optional +Maintainer: Varun Hiremath +Uploaders: Torsten Werner +Build-Depends: debhelper (>= 6), cdbs, libx11-dev, libxext-dev, libxpm-dev, quilt +Standards-Version: 3.7.3 +Homepage: http://dockapps.org/file.php/id/306 +Vcs-Svn: https://bollin.googlecode.com/svn/wmcpu/trunk +Vcs-Browser: http://bollin.googlecode.com/svn/wmcpu/trunk + +Package: wmcpu +Architecture: any +Depends: ${shlibs:Depends} +Description: Window Maker docking app similar to xosview + Displays a 64x64 box with: + * CPU + * Mem + * Swap + * Uptime --- wmcpu-1.4.orig/debian/wmcpu.1x +++ wmcpu-1.4/debian/wmcpu.1x @@ -0,0 +1,51 @@ +.TH wmCPU(1.4-debian) 1x +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +wmcpu \- program to show system information +.SH SYNOPSIS +.B wmcpu +.I "[options]" +.SH "DESCRIPTION" +This manual page documents briefly the +.BR wmcpu +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B wmcpu +puts a 64x64 window for Docking in Window Maker that shows 1) cpu usage, 2) +memory used, 3) load and 4) uptime. +.SH DISPLAYS +.TP +.B Line 1 +CPU usage as a percentage +.TP +.B Line 2 +Memory Usages as a percentage +.TP +.B Line 3 +Current Load (either as a bar or a number) +.TP +.B Line 4 +Uptime +.SH OPTIONS +A summary of options are included below. +.TP +.B \-h +Show summary of options. +.TP +.B \-l +Show load as a number, not a bar +.TP +.B \-display DISPLAY +Uses DISPLAY as the location to display +.TP +.B \-v +Show version of program. +.SH AUTHOR +This manual page was written by Darren Benham , +for the Debian GNU/Linux system (but may be used by others). + +wmCPU is copyrighted by timecop (timecop@linuxwarez.com) +and released under the Gnu Public License. --- wmcpu-1.4.orig/debian/compat +++ wmcpu-1.4/debian/compat @@ -0,0 +1 @@ +6 --- wmcpu-1.4.orig/debian/menu +++ wmcpu-1.4/debian/menu @@ -0,0 +1,2 @@ +?package(wmcpu):needs="X11" section="Applications/System/Monitoring"\ + title="wmCPU" command="/usr/bin/wmcpu" --- wmcpu-1.4.orig/debian/watch +++ wmcpu-1.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://dockapps.org/file.php/id/306 .*/wmcpu-(.*)\.tar\.gz \ No newline at end of file --- wmcpu-1.4.orig/debian/changelog +++ wmcpu-1.4/debian/changelog @@ -0,0 +1,131 @@ +wmcpu (1.4-4) unstable; urgency=low + + * Fix Vcs-{Svn, Browser} fields (Closes: #466725) + + -- Varun Hiremath Sat, 08 Mar 2008 10:57:07 +0530 + +wmcpu (1.4-3) unstable; urgency=low + + * Bump Standards-Version to 3.7.3 + * Bump debhelper compat to 6 + * Add Homepage header and replace XS-Vcs with Vcs + * Fix menu file section + + -- Varun Hiremath Sun, 27 Jan 2008 11:18:44 +0530 + +wmcpu (1.4-2) unstable; urgency=low + + * Upload to unstable. + + -- Torsten Werner Tue, 10 Apr 2007 12:45:54 +0200 + +wmcpu (1.4-1) experimental; urgency=low + + [ Varun Hiremath ] + * New Maintainer (Closes: #400943) + * New upstream release + * Apply display patch, thanks to Martin Pitt (Closes: #212432) + * Apply geometry patch, thanks to Martin Pitt (Closes: #212425) + * Switch to CDBS. + * Switch to quilt for applying patches. + * Build-Depend on debhelper >= 5 + * Add a watch file + * Add Homepage in debain/control. + * Update the download from URL in debian/copyright. + + [ Torsten Werner ] + * Changed the build process a bit to be more Debian like. + * Add some fields to debian/control. + * Upload to experimental. + + -- Torsten Werner Wed, 3 Jan 2007 12:44:57 +0100 + +wmcpu (1.3-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Don't use /usr/X11R6 (Closes: #376422) + * Bump standards version + * Quote menu entry + * Use dh compat 4 + * Fix manpage entry + + -- Julien Danjou Thu, 13 Jul 2006 18:13:16 +0200 + +wmcpu (1.3-4.1) unstable; urgency=low + + * Non-maintainer upload to help with xlibs-dev transition. + * debian/control: Replaced xlibs-dev build-dep. (Closes: #347113) + + -- Marc 'HE' Brockschmidt Fri, 20 Jan 2006 00:37:14 +0100 + +wmcpu (1.3-4) unstable; urgency=low + + * Updated to standards version 3.5.9.0. + * Fix lintian warning postinst-should-not-set-usr-doc-link. + * Fix lintian warning copyright-lists-upstream-authors-with-dh_make- + boilerplate. + + -- Warren A. Layton Sun, 18 May 2003 19:52:04 -0400 + +wmcpu (1.3-3) unstable; urgency=low + + * Fixed the path to the binary in the menu. Thanks to Jason Wojciecho + for pointing this out (Closes: #183082) + + -- Warren A. Layton Fri, 16 May 2003 17:59:20 -0400 + +wmcpu (1.3-2) unstable; urgency=low + + * The last release incorporated the fix from the previous NMU, but I + forgot to close the bug (Closes: #92678) + + -- Warren A. Layton Sun, 3 Mar 2002 18:50:37 -0500 + +wmcpu (1.3-1) unstable; urgency=high + + * New upstream release (Closes: #131123, #78167, #105812) + * New Maintainer (Closes: #135886) + * This isn't a Debian-native package, so uploading upstream source + (Closes: #44280) + * Window Maker menu entry should now be able to launch the program + (Closes: #42182) + * debian/rules: removed obsolete dh_suidregister + * Fixed Lintian errors and warnings + + -- Warren A. Layton Sun, 3 Mar 2002 11:20:48 -0500 + +wmcpu (1.2-2.2) unstable; urgency=low + + * NMU + * Updated the build dependencies. (closes: #92678) + + -- Adrian Bunk Wed, 27 Jun 2001 21:59:55 +0200 + +wmcpu (1.2-2.1) unstable; urgency=low + + * NMU by Branden Robinson . + * Recompile against modern xpm4g package to get proper shared library + dependency and permit this package to be installed with forthcoming + XFree86 4.x packages, which include libXpm. + * debian/control: added Build-Depends + + -- Branden Robinson Fri, 27 Oct 2000 08:49:13 +0300 + +wmcpu (1.2-2) unstable; urgency=low + + * Changing menu entry from wm to X11 (closes: #33401) + + -- Darren Benham Mon, 15 Feb 1999 08:04:41 -0800 + +wmcpu (1.2-1) unstable; urgency=low + + * New upstram source + * Added to the man page (close bug: #33126) + + -- Darren Benham Sun, 14 Feb 1999 21:29:27 -0800 + +wmcpu (1.0-1) unstable; urgency=low + + * Initial Release. + + -- Darren Benham Mon, 1 Feb 1999 15:34:20 -0800 --- wmcpu-1.4.orig/debian/copyright +++ wmcpu-1.4/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Warren A. Layton zeevon@debian.org on +Sun, 3 Mar 2002 11:20:48 -0500. +Taken by Varun Hiremath on Wed, 3 Jan 2007 +14:03:58 +0530 + +It was downloaded from http://dockapps.org/file.php/id/306 + +Copyright: (C) 1998, 1999, 2000, 2001 timecop@japan.co.jp + +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 of the License, 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. + + On Debian systems, you can find the GPL license in: + /usr/share/common-licenses/GPL + +The Debian packaging is (C) 2006, Varun Hiremath and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- wmcpu-1.4.orig/debian/docs +++ wmcpu-1.4/debian/docs @@ -0,0 +1 @@ +README --- wmcpu-1.4.orig/debian/rules +++ wmcpu-1.4/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +install/wmcpu:: + dh_install wmcpu /usr/bin/ --- wmcpu-1.4.orig/debian/manpages +++ wmcpu-1.4/debian/manpages @@ -0,0 +1 @@ +debian/wmcpu.1x