[Pkg-wmaker-commits] [wmcube] 08/67: Imported Debian patch 0.99-pre1-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 03:22:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcube.
commit f0aa5e1b38edd9a8cc9a99beff9da86f004fbf93
Merge: f25eb83 925287e
Author: Sandro Tosi <matrixhasu at gmail.com>
Date: Wed Jan 30 19:58:58 2008 +0100
Imported Debian patch 0.99-pre1-1
3dObjects/2planes-solid.wmc | 23 -
3dObjects/4d.wmc | 59 -
3dObjects/8star-small.wmc | 40 -
3dObjects/8star.wmc | 40 -
3dObjects/CONTRIBUTE | 51 -
3dObjects/README | 54 -
3dObjects/ball.wmc | 83 --
3dObjects/celtic.wmc | 71 -
3dObjects/cross.wmc | 63 -
3dObjects/cross2.wmc | 51 -
3dObjects/cross3.wmc | 95 --
3dObjects/crystal.wmc | 108 --
3dObjects/cube.wmc | 24 -
3dObjects/diamond.wmc | 66 -
3dObjects/e.wmc | 69 -
3dObjects/e2.wmc | 160 ---
3dObjects/foo.wmc | 149 ---
3dObjects/gnustep.wmc | 110 --
3dObjects/hyperpyramid.wmc | 54 -
3dObjects/jeep.wmc | 157 ---
3dObjects/multicube.wmc | 83 --
3dObjects/pyramid.wmc | 16 -
3dObjects/shield.wmc | 197 ---
3dObjects/spaceshuttle.wmc | 382 ------
3dObjects/spiral.wmc | 49 -
3dObjects/star.wmc | 95 --
3dObjects/starcube.wmc | 69 -
CHANGES | 22 +-
INSTALL | 37 -
Makefile | 58 +
README | 124 +-
TODO | 8 -
WmcObject.cc | 619 +++++++++
WmcObject.h | 96 ++
cpumoncc/README | 70 +
cpumoncc/base/BaseCpuMonitor.h | 112 ++
cpumoncc/darwin/CpuMonitor.cc | 41 +
cpumoncc/darwin/CpuMonitor.h | 39 +
cpumoncc/darwin/Makefile | 41 +
cpumoncc/freebsd/CpuMonitor.cc | 80 ++
cpumoncc/freebsd/CpuMonitor.h | 52 +
cpumoncc/freebsd/Makefile | 41 +
cpumoncc/linux/CpuMonitor.cc | 100 ++
cpumoncc/linux/CpuMonitor.h | 45 +
cpumoncc/linux/Makefile | 40 +
cpumoncc/netbsd/CpuMonitor.cc | 113 ++
cpumoncc/netbsd/CpuMonitor.h | 43 +
cpumoncc/netbsd/Makefile | 40 +
cpumoncc/openbsd/CpuMonitor.cc | 42 +
cpumoncc/openbsd/CpuMonitor.h | 38 +
cpumoncc/openbsd/Makefile | 40 +
cpumoncc/programs/Makefile | 14 +
cpumoncc/programs/README | 17 +
cpumoncc/programs/cpu.cc | 56 +
cpumoncc/programs/cpuload.cc | 60 +
cpumoncc/solaris/CpuMonitor.cc | 141 ++
cpumoncc/solaris/CpuMonitor.h | 53 +
cpumoncc/solaris/Makefile | 40 +
debian/README.debian | 5 -
debian/changelog | 50 +
debian/control | 3 +-
debian/copyright | 79 +-
debian/dirs | 4 -
debian/menu | 2 +-
debian/patches/00list | 7 +-
debian/patches/10_datapath_old.dpatch | 19 -
.../patches/10_fixes_for_0.99pre1_upgrade.dpatch | 112 ++
debian/patches/20_parallel_build.dpatch | 39 +
debian/patches/20_secfix_old.dpatch | 96 --
debian/patches/30_bts-386850_fix_smp.dpatch | 34 +
debian/patches/30_restore_pristine_code.dpatch | 167 ---
.../patches/40_bts-357072_long_uptime_fix.dpatch | 32 +
debian/rules | 23 +-
debian/watch | 2 +
debian/{3dObjects => wmc}/X-lines.wmc | 0
debian/{3dObjects => wmc}/X-planes.wmc | 0
debian/wmcube.1 | 17 +-
COPYING => wmapp/COPYING | 11 +-
wmapp/Changelog | 82 ++
wmapp/Changelog.Jason | 154 +++
wmapp/FAQ.txt | 278 ++++
wmapp/Makefile | 35 +
wmapp/README | 66 +
wmapp/Widgets.txt | 49 +
wmapp/colors.h | 54 +
wmapp/example1/Makefile | 13 +
wmapp/example1/debian-tiny.xpm | 50 +
wmapp/example1/window0.cc | 204 +++
wmapp/example1/window1.cc | 86 ++
wmapp/example1/wmexample.cc | 39 +
wmapp/example2/Makefile | 13 +
wmapp/example2/wmairtrafficcontrol.cc | 80 ++
wmapp/example2/wmradar.cc | 220 ++++
wmapp/example2/wmradar.h | 44 +
wmapp/wmapp.cc | 378 ++++++
wmapp/wmapp.h | 170 +++
wmapp/wmbutton.cc | 59 +
wmapp/wmbutton.h | 18 +
wmapp/wmcallback.cc | 34 +
wmapp/wmcallback.h | 113 ++
wmapp/wmcanvas.cc | 160 +++
wmapp/wmcanvas.h | 68 +
wmapp/wmclickable.h | 21 +
wmapp/wmellipse.cc | 58 +
wmapp/wmellipse.h | 21 +
wmapp/wmframe.cc | 303 +++++
wmapp/wmframe.h | 109 ++
wmapp/wmhistory.cc | 67 +
wmapp/wmhistory.h | 71 +
wmapp/wmimage.cc | 91 ++
wmapp/wmimage.h | 52 +
wmapp/wmled.cc | 12 +
wmapp/wmled.h | 34 +
wmapp/wmmeter.h | 57 +
wmapp/wmmeterbar.cc | 80 ++
wmapp/wmmeterbar.h | 47 +
wmapp/wmslider.cc | 42 +
wmapp/wmslider.h | 32 +
wmapp/wmtextbar.cc | 63 +
wmapp/wmtextbar.h | 57 +
wmapp/wmwidget.cc | 99 ++
wmapp/wmwidget.h | 367 ++++++
wmapp/wmwindow.cc | 114 ++
wmapp/wmwindow.h | 130 ++
wmapp/xpm/charmap-large.xpm | 74 ++
wmapp/xpm/charmap-medium.xpm | 62 +
wmapp/xpm/charmap-small.xpm | 62 +
wmapp/xpm/checkbox.xpm | 14 +
wmapp/xpm/emptybar.xpm | 62 +
wmapp/xpm/fullbar.xpm | 62 +
wmapp/xpm/leds.xpm | 14 +
wmapp/xpm/tile.xpm | 121 ++
wmapp/xpm/xbutton.xpm | 14 +
wmapp/xwrapper.cc | 329 +++++
wmapp/xwrapper.h | 140 ++
3dObjects/ball-solid.wmc => wmc/ball.wmc | 53 +
wmc/cossin.wmc | 362 ++++++
wmc/coussin.bande.diag.wmc | 124 ++
{3dObjects => wmc}/cross2-solid.wmc | 0
{3dObjects => wmc}/cross3-solid.wmc | 0
3dObjects/cube-solid.wmc => wmc/cube.wmc | 16 +
wmc/diamond.wmc | 107 ++
3dObjects/dice-solid.wmc => wmc/dice.wmc | 45 +
wmc/hyp_par.wmc | 70 +
wmc/judaspriest.wmc | 239 ++++
{3dObjects => wmc}/peace.wmc | 2 +
{3dObjects => wmc}/radioactive.wmc | 2 +
3dObjects/cross4-solid.wmc => wmc/star-solid.wmc | 48 +-
{3dObjects => wmc}/wmlogo.wmc | 2 +
wmcube.cc | 695 ++++++++++
wmcube.h | 118 ++
wmcube/Makefile | 39 -
wmcube/Makefile.FREEBSD | 38 -
wmcube/Makefile.LINUX | 39 -
wmcube/Makefile.NETBSD | 36 -
wmcube/Makefile.OPENBSD | 37 -
wmcube/Makefile.SOLARIS | 38 -
wmcube/wmcube.c | 1351 --------------------
wmcube/wmcube.xpm | 142 --
wmgeneral/list.c | 169 ---
wmgeneral/list.h | 59 -
wmgeneral/misc.c | 164 ---
wmgeneral/misc.h | 9 -
wmgeneral/wmgeneral.c | 481 -------
wmgeneral/wmgeneral.h | 59 -
165 files changed, 9759 insertions(+), 5575 deletions(-)
diff --cc debian/README.debian
index 6b0ff96,0000000..524aca5
mode 100644,000000..100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@@ -1,16 -1,0 +1,11 @@@
+wmcube for DEBIAN
+-------------------
+
- This is Debian GNU/Linux's prepackaged version of wmcube, a very
- nifty load meter designed with NeXTStep/OpenStep in mind.
-
- -- Edward C. Lang <edlang at debian.org> Fri, 14 Apr 2000 17:36:34 +1000
-
+It is possible to use this with other windowmanagers than just WindowMaker;
+in fact that is what I do.
+Here is my configuration line to use it with Fvwm2 and the FvwmButtons module:
+
+*FvwmButtons(Size 64 64, Swallow(NoHints) wmcube 'Exec exec wmcube -b &')
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Sun, 27 May 2001 00:35:56 +0200
+
diff --cc debian/changelog
index d1311db,0000000..6007aea
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,121 -1,0 +1,171 @@@
++wmcube (0.99-pre1-1) unstable; urgency=low
++
++ * New upstream release (Closes: #239522)
++ * debian/control
++ - bump Standards-Version to 3.7.3
++ - added Homepage field
++ * debian/menu
++ - updated to new menu policy
++ * debian/copyright
++ - copyright and upstream author indented with 4 spaces
++ - updated copyright note
++ - added copyright/license notes for wmapp directory
++ * debian/README.debian
++ - removed package description
++ - updated upstream email & website address
++ * debian/watch
++ - added
++ * debian/rules
++ - installing upstream changelog
++ - don't install removed files
++ - changed binary location in install target
++ - removed TODO from docs installation since no more in upstream tarball
++ - destination dir creation integrated into install target
++ - remove execution rights from data files (*.wmc)
++ - clean target reorg to be run on patched source
++ - build target depends on patch, not build-stamp on patch-stamp
++ * debian/3dObjects/
++ - renamed to debian/wmc to match upstream directory
++ * debian/patches/10_fixes_for_0.99pre1_upgrade.dpatch
++ - added to let new upstream release compile; thanks to Peter De Wachter
++ from #debian-mentors IRC channel
++ * debian/patches/10_datapath_old.dpatch
++ - removed since merged upstream / no more applicable
++ * debian/patches/30_restore_pristine_code.dpatch
++ - removed since merged upstream / no more applicable
++ * debian/dirs
++ - removed
++ * debian/patches/20_secfix_old.dpatch
++ - removed since no more applicable
++ * debian/patches/20_parallel_build.dpatch
++ - patch to allow parallel build
++ * debian/patches/30_bts-386850_fix_smp.dpatch
++ - added to fix smp support (Closes: #386850)
++ * debian/patches/40_bts-357072_long_uptime_fix.dpatch
++ - fix program running on machine with long uptime (Closes: #357072)
++ * debian/wmcube.1
++ - adapted to new upstream release
++
++ -- Sandro Tosi <matrixhasu at gmail.com> Wed, 30 Jan 2008 19:58:58 +0100
++
+wmcube (0.98-8) unstable; urgency=low
+
+ * Adopting package (Closes: #414531)
+ * debian/control
+ - added myself as new maintainer
+ - little reformat of short and long description
+ - added dependency against dpatch
+ * debian/copyright
+ - set myself as new maintainer
+ - added copyright notes for wmgeneral files
+ - reformat of license note
+ * debian/docs
+ - removed since integrated into debian/rules
+ * debian/rules
+ - changed dh_installdocs call adding filenames as parameters
+ - removed some commented line here and there
+ - manpage installation done using dh_installman
+ - added install target
+ - 3dObjects/{README,CONTRIBUTE} moved from install to dh_installdocs
+ - removed "source diff" targe" target
+ - removed all those custom patch application code since we are now using
+ dpatch
+ - patches to apply is selected using debian/patches/00list and not using a
+ variable here
+ - fixing installation of 3dObjects files
+ - fixed a lintian warning on "make clean" call
+ * debian/menu
+ - changes section to Applications
+ * debian/post{inst,rm}.debhelper
+ - removed since menu updatation is done automatically now
+ * debian/patches/{10_datapath_old,20_secfix_old}.dpatch
+ - replases old dpatch-style patches
+ * debian/patches/smpfix.dpatch
+ - removed since already present in 20_secfix_old.dpatch
+ * debian/3dObjects/X-{lines,planes}.wmc
+ - moved from top level directory into debian since they are not present
+ into upstream release
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Sun, 07 Oct 2007 16:08:46 +0200
+
+wmcube (0.98-7) unstable; urgency=low
+
+ * QA upload.
+ * Set maintainer address to QA group.
+ * Fixed broken copyright file.
+ * Bumped standards version, no changes needed.
+
+ -- Nico Golde <nion at debian.org> Fri, 23 Mar 2007 20:38:45 +0100
+
+wmcube (0.98-6.1) unstable; urgency=low
+
+ * NMU to fix release critical bug
+ * Split xlibs-dev build depends into individual Xorg libraries
+ (Closes: #346969)
+ * Make package lintian clean:
+ - use debhelper v5
+ - update Standards version to 3.6.2.1
+ - refer to common license text in debian/copyright
+
+ -- Bastian Kleineidam <calvin at debian.org> Fri, 13 Jan 2006 21:13:58 +0100
+
+wmcube (0.98-6) unstable; urgency=low
+
+ * Add two new objects (X-lines & X-planes). Thanks Mathias Czapla.
+ * Update Standards-Version:; support noopt and nostrip build options.
+ * Update upstream URL in debian/copyright.
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Thu, 26 Dec 2002 22:13:26 +0100
+
+wmcube (0.98-5) unstable; urgency=high
+
+ * Fix smp support which broke due to the source fixes in previous upload.
+ (Closes: #125902)
+ * Keep urgency at high to try to get this into testing asap, to fix the
+ security issues.
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Thu, 20 Dec 2001 19:29:44 +0100
+
+wmcube (0.98-4) unstable; urgency=high
+
+ * Apply security fixes from corecode wmcube-gdk advisory
+ * Adopt dpatch system to apply patches to upstream source during the build.
+ * Update Standards-Version:; no changes were necessary.
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Wed, 19 Dec 2001 10:49:14 +0100
+
+wmcube (0.98-3) unstable; urgency=low
+
+ * Add manpage contributed by Evelyn Mitchell. (Closes: #93479)
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Sat, 28 Jul 2001 19:34:31 +0200
+
+wmcube (0.98-2) unstable; urgency=low
+
+ * Fix incorrect menu entry. (Closes: #103450)
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Fri, 6 Jul 2001 17:20:20 +0200
+
+wmcube (0.98-1) unstable; urgency=low
+
+ * New maintainer. (Closes: #98249)
+ * New upstream version.
+ * Add Build-Depends.
+ * Update Standards-Version.
+ * Remove post{inst,rm}. They are generated by debhelper.
+ * Make wmcube by default look in /usr/share/wmcube for object definitions.
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Sun, 27 May 2001 01:02:38 +0200
+
+wmcube (0.90-2) unstable; urgency=low
+
+ * NMU to fix ownership
+
+ -- Sean 'Shaleh' Perry <shaleh at debian.org> Fri, 6 Oct 2000 10:58:45 -0700
+
+wmcube (0.90-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Edward C. Lang <edlang at debian.org> Fri, 14 Apr 2000 17:36:34 +1000
+
diff --cc debian/control
index 89957a7,0000000..56d27ea
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,21 @@@
+Source: wmcube
+Section: x11
+Priority: optional
+Maintainer: Sandro Tosi <matrixhasu at gmail.com>
+Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev, dpatch
- Standards-Version: 3.7.2
++Standards-Version: 3.7.3
++Homepage: http://kling.mine.nu/oldsite/wmcube.htm
+
+Package: wmcube
+Architecture: any
+Section: x11
+Priority: optional
+Depends: ${shlibs:Depends}
+Suggests: wmaker
+Description: spinning 3D object that shows the current CPU load
+ wmcube is a dockapp that displays a realtime rotating 3D object which
+ indicates current CPU load. The higher the load, the faster the
+ object spins. On SMP machines one instance can be run for each
+ processor.
+ .
+ Originally wmcube could spin only a cube, hence the name.
diff --cc debian/copyright
index 1b401af,0000000..4348777
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,97 -1,0 +1,42 @@@
+This package was debianized by Edward C. Lang
+<edlang at debian.org> on Fri, 14 Apr 2000 17:40:59 +1000
+
+Is is now maintained by Sandro Tosi <matrixhasu at gmail.com>
+
- It was downloaded from http://kling.mine.nu/kling/.
++It was downloaded from http://kling.mine.nu/oldsite/wmcube.htm .
+
- Upstream Author: Robert Kling <robkli-8 at student.luth.se>
++Upstream Author:
+
- Copyright: 2000,2001 by Robert Kling
++ Robert Kling <kling.robert at gmail.com>
++
++Copyright:
++
++ Copyright (C) 2003 Robert Kling, robkli-8 at student.luth.se
+
+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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+wmCube is licensed through the GNU General Public License, see
+/usr/share/common-licenses/GPL for more info.
+
+The following files have different copyright notes:
+
- wmgeneral/list.{c,h}:
-
- /* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
- Author: Kresten Krab Thorup
-
- Many modifications by Alfredo K. Kojima
-
-
- This file is part of GNU CC.
-
- GNU CC 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.
-
- GNU CC 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 GNU CC; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA. */
-
- /* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-
- wmgeneral/misc.c:
-
- /* dock.c- built-in Dock module for WindowMaker
- *
- * WindowMaker window manager
- *
- * Copyright (c) 1997 Alfredo K. Kojima
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
- wmgeneral/wmgeneral.c:
-
- Author: Martijn Pieterse (pieterse at xs4all.nl)
-
++wmapp/*
++WMApp: version 0.0.4.1
++Copyright (C) 2001-2003 Kevin and Jason McCarty <kmccarty at princeton.edu>
++ and others (see code for details)
++Licensed under the GNU GPL.
diff --cc debian/menu
index 51bc497,0000000..b4e5e6b
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,3 -1,0 +1,3 @@@
+?package(wmcube):needs="x11" \
- section="Applications/System" title="wmcube"\
++ section="Applications/System/Monitoring" title="wmcube"\
+ command="/usr/bin/wmcube"
diff --cc debian/patches/00list
index 701d82d,0000000..cb8fd18
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,3 -1,0 +1,4 @@@
- 10_datapath_old
- 20_secfix_old
- 30_restore_pristine_code
++10_fixes_for_0.99pre1_upgrade.dpatch
++20_parallel_build
++30_bts-386850_fix_smp
++40_bts-357072_long_uptime_fix
diff --cc debian/patches/10_fixes_for_0.99pre1_upgrade.dpatch
index 0000000,0000000..2ea88ba
new file mode 100644
--- /dev/null
+++ b/debian/patches/10_fixes_for_0.99pre1_upgrade.dpatch
@@@ -1,0 -1,0 +1,112 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 10_fixes_for_0.99pre1_upgrade.dpatch by Peter De Wachter <pdewacht at gmail.comq>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Fixes 0.99pre1 release to compile on a debian system
++
++ at DPATCH@
++
++Index: wmcube-0.99-pre1/Makefile
++===================================================================
++--- wmcube-0.99-pre1.orig/Makefile 2008-01-28 23:06:48.000000000 +0100
+++++ wmcube-0.99-pre1/Makefile 2008-01-28 23:08:04.000000000 +0100
++@@ -11,7 +11,7 @@
++ #
++ #
++ CXX= g++
++-CXXFLAGS=-O2 -DLINUX
+++CXXFLAGS=-O2 -DLINUX -Wno-write-strings
++ CPUMONCC_OS=linux
++ WMCUBE_LIBS=-Lwmapp -lwmapp -Lcpumoncc/$(CPUMONCC_OS) -lcpumoncc
++ LFLAGS=$(WMCUBE_LIBS) -L/usr/X11R6/lib -lXpm -lXext -lX11
++Index: wmcube-0.99-pre1/wmapp/Makefile
++===================================================================
++--- wmcube-0.99-pre1.orig/wmapp/Makefile 2008-01-28 23:09:04.000000000 +0100
+++++ wmcube-0.99-pre1/wmapp/Makefile 2008-01-28 23:10:45.000000000 +0100
++@@ -1,5 +1,5 @@
++ export CXX = g++
++-export CFLAGS = -fPIC -g -Wall -pedantic -O2
+++export CFLAGS = -fPIC -g -Wall -Wno-write-strings -O2
++ export LFLAGS = -L$(CURDIR) -L/usr/X11R6/lib -lXpm -lXext -lX11 -lwmapp
++
++ SOURCES = $(wildcard *.cc)
++Index: wmcube-0.99-pre1/cpumoncc/linux/CpuMonitor.cc
++===================================================================
++--- wmcube-0.99-pre1.orig/cpumoncc/linux/CpuMonitor.cc 2008-01-28 23:09:59.000000000 +0100
+++++ wmcube-0.99-pre1/cpumoncc/linux/CpuMonitor.cc 2008-01-28 23:10:12.000000000 +0100
++@@ -23,6 +23,7 @@
++ // CpuMonitorCC/Linux
++
++ #include <stdio.h>
+++#include <string.h>
++ #include "CpuMonitor.h"
++
++ CpuMonitor::CpuMonitor() : BaseCpuMonitor()
++Index: wmcube-0.99-pre1/wmapp/xwrapper.h
++===================================================================
++--- wmcube-0.99-pre1.orig/wmapp/xwrapper.h 2008-01-28 23:11:03.000000000 +0100
+++++ wmcube-0.99-pre1/wmapp/xwrapper.h 2008-01-28 23:16:40.000000000 +0100
++@@ -16,11 +16,6 @@
++ // prefix must be avoided when using them. Still, it is nice to use
++ // a separate namespace whenever possible.
++
++- // the next line ensures that X macros are expanded correctly into functions
++- // in the X namespace, since _XPrivDisplay appears to be the only
++- // real X object used by all X macros:
++-# define _XPrivDisplay X::_XPrivDisplay
++-
++ // this is just so I can easily see which identifiers are macros from Xlib
++ // that can't be prefixed by "X::"
++ # define X_MACRO(x) (x)
++@@ -33,6 +28,8 @@
++ }
++ };
++
+++using X::_XPrivDisplay; //only slightly less evil than the original hack
+++
++ // forward declaration for rectangle
++ struct WMRectangle;
++
++Index: wmcube-0.99-pre1/wmapp/wmapp.cc
++===================================================================
++--- wmcube-0.99-pre1.orig/wmapp/wmapp.cc 2008-01-28 23:11:47.000000000 +0100
+++++ wmcube-0.99-pre1/wmapp/wmapp.cc 2008-01-28 23:12:17.000000000 +0100
++@@ -1,13 +1,13 @@
++ #include <string>
+++#include <string.h>
+++#include <unistd.h>
++ #include "wmapp.h"
++ #include "wmwindow.h"
++
++ using std::string;
++
++ namespace Unix {
++- extern "C" {
++-# include <unistd.h> // for usleep()
++- }
+++ using ::usleep;
++ };
++
++ // All the xpms we need:
++Index: wmcube-0.99-pre1/wmapp/wmwindow.cc
++===================================================================
++--- wmcube-0.99-pre1.orig/wmapp/wmwindow.cc 2008-01-28 23:12:58.000000000 +0100
+++++ wmcube-0.99-pre1/wmapp/wmwindow.cc 2008-01-28 23:13:03.000000000 +0100
++@@ -1,4 +1,5 @@
++ #include <iostream>
+++#include <string.h>
++ #include "wmwindow.h"
++ #include "wmapp.h"
++
++Index: wmcube-0.99-pre1/wmcube.cc
++===================================================================
++--- wmcube-0.99-pre1.orig/wmcube.cc 2008-01-28 23:12:38.000000000 +0100
+++++ wmcube-0.99-pre1/wmcube.cc 2008-01-28 23:12:44.000000000 +0100
++@@ -6,6 +6,7 @@
++ #include <vector>
++ #include <math.h>
++ #include <unistd.h>
+++#include <string.h>
++
++ #include "WmcObject.h"
++ #include "wmcube.h"
diff --cc debian/patches/20_parallel_build.dpatch
index 0000000,0000000..d1d9040
new file mode 100644
--- /dev/null
+++ b/debian/patches/20_parallel_build.dpatch
@@@ -1,0 -1,0 +1,39 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 20_parallel_build.dpatch by Sandro Tosi <matrixhasu at gmail.com>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Patch to allow parallel build
++
++ at DPATCH@
++diff -urNad wmcube~/Makefile wmcube/Makefile
++--- wmcube~/Makefile 2008-01-30 00:03:47.985006396 +0100
+++++ wmcube/Makefile 2008-01-30 00:04:16.770646797 +0100
++@@ -32,7 +32,7 @@
++ @@echo "# Please modify/verify the makefile in that directory before"
++ @@echo "# reporting an error as a bug."
++ @@echo "###############################################################"
++- cd cpumoncc/$(CPUMONCC_OS); make; cd ../..
+++ cd cpumoncc/$(CPUMONCC_OS); $(MAKE); cd ../..
++
++ wmapp/libwmapp.a:
++ @@echo "###############################################################"
++@@ -40,7 +40,7 @@
++ @@echo "# Please modify/verify the makefile in that directory before"
++ @@echo "# reporting an error as a bug."
++ @@echo "###############################################################"
++- cd wmapp; make; cd ..
+++ cd wmapp; $(MAKE); cd ..
++
++ install: $(TARGET)
++ cp -Rf wmc /usr/share/wmcube
++@@ -50,8 +50,8 @@
++
++ clean:
++ rm -f *.o *\~ $(TARGET)
++- cd wmapp; make clean; cd ..
++- cd cpumoncc/$(CPUMONCC_OS); make clean; cd ../..
+++ cd wmapp; $(MAKE) clean; cd ..
+++ cd cpumoncc/$(CPUMONCC_OS); $(MAKE) clean; cd ../..
++
++ install_clean:
++ rm -fr /usr/share/wmcube
diff --cc debian/patches/30_bts-386850_fix_smp.dpatch
index 0000000,0000000..dfb1204
new file mode 100644
--- /dev/null
+++ b/debian/patches/30_bts-386850_fix_smp.dpatch
@@@ -1,0 -1,0 +1,34 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 30_bts-386850_fix_smp.dpatch by Sandro Tosi <matrixhasu at gmail.com>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: BTS 386850, fix smp support, reading all the fields in /proc/stat
++
++ at DPATCH@
++diff -urNad wmcube~/cpumoncc/linux/CpuMonitor.cc wmcube/cpumoncc/linux/CpuMonitor.cc
++--- wmcube~/cpumoncc/linux/CpuMonitor.cc 2008-01-30 02:11:55.463090804 +0100
+++++ wmcube/cpumoncc/linux/CpuMonitor.cc 2008-01-30 02:12:56.102546452 +0100
++@@ -62,7 +62,7 @@
++
++ for (i = -2; i < which_cpu; i++)
++ {
++- fscanf(fp, "%5s %31s %31s %31s %31s", cpuid, tmp, tmp, tmp, tmp);
+++ fscanf(fp, "%5s %31s %31s %31s %31s %31s %31s %31s %31s", cpuid, tmp, tmp, tmp, tmp, tmp, tmp, tmp, tmp);
++ //fscanf(fp, "%5s" , cpuid); printf("%s ", cpuid);
++ //fscanf(fp, "%31s", tmp ); printf("%s ", tmp);
++ //fscanf(fp, "%31s", tmp ); printf("%s ", tmp);
++@@ -80,12 +80,13 @@
++ char cpuid[6];
++ int cpu,nice,system,idle;
++ float t;
+++ char tmp[32];
++ FILE *fp;
++
++ fp = fopen("/proc/stat","r");
++
++ for (i = -2; i < which_cpu; i++)
++- fscanf(fp,"%5s %d %d %d %d", cpuid, &cpu, &nice, &system, &idle);
+++ fscanf(fp,"%5s %d %d %d %d %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
++
++ fclose(fp);
++
diff --cc debian/patches/40_bts-357072_long_uptime_fix.dpatch
index 0000000,0000000..fb1ceed
new file mode 100644
--- /dev/null
+++ b/debian/patches/40_bts-357072_long_uptime_fix.dpatch
@@@ -1,0 -1,0 +1,32 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 40_bts-357072_long_uptime_fix.dpatch by Sandro Tosi <matrixhasu at gmail.com>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Fix execution on machine with long uptime, using unsigned int
++
++ at DPATCH@
++diff -urNad wmcube~/cpumoncc/linux/CpuMonitor.cc wmcube/cpumoncc/linux/CpuMonitor.cc
++--- wmcube~/cpumoncc/linux/CpuMonitor.cc 2008-01-30 20:32:42.762911925 +0100
+++++ wmcube/cpumoncc/linux/CpuMonitor.cc 2008-01-30 20:32:54.135560012 +0100
++@@ -76,9 +76,10 @@
++
++ float CpuMonitor::getLoad()
++ {
++- int total, used, i;
+++ unsigned int total, used;
+++ int i;
++ char cpuid[6];
++- int cpu,nice,system,idle;
+++ unsigned int cpu,nice,system,idle;
++ float t;
++ char tmp[32];
++ FILE *fp;
++@@ -86,7 +87,7 @@
++ fp = fopen("/proc/stat","r");
++
++ for (i = -2; i < which_cpu; i++)
++- fscanf(fp,"%5s %d %d %d %d %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
+++ fscanf(fp,"%5s %u %u %u %u %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
++
++ fclose(fp);
++
diff --cc debian/rules
index 91c3541,0000000..a059c66
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,72 -1,0 +1,73 @@@
+#!/usr/bin/make -f
+# This is a -*- makefile -*-
+# Modified from the sample debian/rules that uses debhelper.
+# GNU copyright 1998 by Marcelo Magallon.
+# GNU copyright 1997 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+CFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE = $(INSTALL) -p -o root -g root -m 0644
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 0755
+INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 0755
+INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 0755
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
- build: build-stamp
- build-stamp: patch-stamp
++build: patch build-stamp
++build-stamp:
+ dh_testdir
- $(MAKE) -C wmcube CFLAGS="$(CFLAGS)"
++ $(MAKE) CFLAGS="$(CFLAGS)"
+ touch build-stamp
+
- clean: unpatch
++clean: clean-patched unpatch
++clean-patched: patch-stamp
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) -C wmcube clean
++ [ ! -f Makefile ] || $(MAKE) clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
- dh_installdirs usr/share/wmcube
- $(INSTALL_PROGRAM) wmcube/wmcube $(CURDIR)/debian/wmcube/usr/bin/wmcube
- dh_install 3dObjects/*.wmc debian/3dObjects/*.wmc usr/share/wmcube
++ dh_installdirs usr/share/wmcube usr/bin
++ $(INSTALL_PROGRAM) wmcube $(CURDIR)/debian/wmcube/usr/bin/wmcube
++ dh_install wmc/*.wmc debian/wmc/*.wmc usr/share/wmcube
++ chmod -x $(CURDIR)/debian/wmcube/usr/share/wmcube/*
+
+# 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_testdir
+ dh_testroot
- # dh_installexamples `find XPM -type f`
+ dh_installmenu
- dh_installdocs README TODO 3dObjects/README 3dObjects/CONTRIBUTE
++ dh_installdocs README
+ dh_installman debian/wmcube.1
- dh_installchangelogs
++ dh_installchangelogs CHANGES
+ 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 install
diff --cc debian/watch
index 0000000,0000000..8dd13ff
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=3
++http://kling.mine.nu/oldsite/wmcube.htm files/wmcube-(.*)\.tar\.gz
diff --cc debian/wmc/X-lines.wmc
index 8c1600f,0000000..8c1600f
mode 100644,000000..100644
--- a/debian/wmc/X-lines.wmc
+++ b/debian/wmc/X-lines.wmc
diff --cc debian/wmc/X-planes.wmc
index a4d6769,0000000..a4d6769
mode 100644,000000..100644
--- a/debian/wmc/X-planes.wmc
+++ b/debian/wmc/X-planes.wmc
diff --cc debian/wmcube.1
index 7757ec9,0000000..ff789cc
mode 100644,000000..100644
--- a/debian/wmcube.1
+++ b/debian/wmcube.1
@@@ -1,31 -1,0 +1,36 @@@
+.\" -*- nroff -*-
+.TH wmcube 1 "28 Jul 2001" Debian "3D object CPU Load display applet"
+
+.SH NAME
+wmcube \- spinning 3d object that shows the current CPU load
+
+.SH SYNOPSIS
+wmcube
+[ \fB-o\fP <filename or directory> ]
- [ \fB-d\fP degrees ]
- [ \fB-r\fP acceleration ]
- [ \fB-c\fP cpu-to-monitor ]
++[ \fB-c\fP <cpu to monitor> ]
++[ \fB-u\fP ]
++[ \fB-k\fP ]
++[ \fB-r\fP ]
+[ \fB-n\fP ]
++[ \fB-f\fP ]
++[ \fB-s\fP ]
+[ \fB-b\fP ]
- [ \fB-i\fP ]
- [ \fB-p\fP ]
++[ \fB-l\fP ]
+[ \fB-h\fP ]
+
+.SH DESCRIPTION
+.I wmcube
+is a dockapp that displays a realtime rotating 3d-object which indicates
+current CPU load. The higher the load, the faster the object spins.
+
++For an explanation of options, run the command with "\-h" option.
++
+.SH AUTHOR
+Evelyn Mitchell (efm at tummy.com) wrote this manpage for the Debian prepackaged
+version of wmcube. It was adapted by Filip Van Raemdonck
- (mechanix at digibel.org) for version 0.98 of wmcube.
++(mechanix at digibel.org) for version 0.98 of wmcube. It was adapted by Sandro Tosi
++<matrixhasu at gmail.com> for version 0.99-pre1 of wmcube.
+
+.SH SEE ALSO
+.BR fvwm (1), wmaker (1)
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcube.git
More information about the Pkg-wmaker-commits
mailing list