--- procmeter3-3.4e.orig/debian/changelog +++ procmeter3-3.4e/debian/changelog @@ -0,0 +1,547 @@ +procmeter3 (3.4e-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Sat, 29 Apr 2006 12:26:47 -0400 + +procmeter3 (3.4d-5) unstable; urgency=low + + * Set procmeter3_modules section to 1, not 4, to match the filename and + installation location. Although 1 isn't quite right, 4 is much less + right. + * Current standards version. + + -- Joey Hess Sun, 18 Dec 2005 17:19:12 -0500 + +procmeter3 (3.4d-4) unstable; urgency=low + + * Transition away from xlibs-dev. + + -- Joey Hess Wed, 30 Nov 2005 17:02:58 -0500 + +procmeter3 (3.4d-3) unstable; urgency=low + + * Remove symlink creation code; symlinks now kept in svn repo. + * Fix man page typos spotted by A Costa. Also sent upstream. + Closes: #337189, #337188 + + -- Joey Hess Tue, 8 Nov 2005 15:01:22 -0500 + +procmeter3 (3.4d-2) unstable; urgency=low + + * Fix a bug in acpi.c that made it not read the info file and thus, not + work. See bug #307278 + + -- Joey Hess Mon, 2 May 2005 18:17:18 -0400 + +procmeter3 (3.4d-1) unstable; urgency=low + + * New upstream release: + - Updated ACPI support to handle kernel version 2.6. + - Added support for /dev/mapper in disk statistics. + - Change to using 64-bit variables from /proc/stat. + + -- Joey Hess Sat, 30 Apr 2005 23:05:10 -0400 + +procmeter3 (3.4c-4) unstable; urgency=low + + * Improved (working) patch from Igor Goryachieff. + + -- Joey Hess Wed, 15 Dec 2004 18:28:57 -0500 + +procmeter3 (3.4c-3) unstable; urgency=low + + * Patch from Igor Goryachieff to fix the acpi bits that are not in + wmbattery. Closes: #284945 + + -- Joey Hess Thu, 9 Dec 2004 15:45:20 -0500 + +procmeter3 (3.4c-2) unstable; urgency=low + + * Ported over the last year or so of acpi changes from wmbattery. + In particular, support the 2.6 kernel. + + -- Joey Hess Wed, 24 Nov 2004 17:05:30 -0500 + +procmeter3 (3.4c-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Mon, 6 Sep 2004 14:16:35 -0400 + +procmeter3 (3.4b-1) unstable; urgency=low + + * New upstream release. + - Incorporating my hostap changes. + - Supporting 2.6 kernel's proc. Closes: #241140 + * Fix debhelper build dep. + * Quote stuff in menu file. + * Update standards-version. + + -- Joey Hess Sun, 25 Apr 2004 13:32:25 -0400 + +procmeter3 (3.4a-2) unstable; urgency=low + + * Add support for hostap, which adds a new field to the end of + /proc/net/wireless. + + -- Joey Hess Mon, 29 Dec 2003 12:25:51 -0500 + +procmeter3 (3.4a-1) unstable; urgency=low + + * New upstream release. + - Includes the biff atime fix. Closes: #185112 + + -- Joey Hess Sun, 29 Jun 2003 20:10:08 -0400 + +procmeter3 (3.4-3) unstable; urgency=low + + * Built with xaw 7. + + -- Joey Hess Sun, 9 Mar 2003 18:01:13 -0500 + +procmeter3 (3.4-2) unstable; urgency=low + + * Patch from upstream to fix parsing of /proc/stat for interrupts and + avoid crash. + + -- Joey Hess Mon, 24 Feb 2003 11:22:03 -0500 + +procmeter3 (3.4-1) unstable; urgency=low + + * New upstream release with lcdproc support. + * Better supports the 2.5 kernel. Closes: #167352 + * Removed more newlines that confuse lexgrog. + + -- Joey Hess Sun, 2 Feb 2003 15:37:24 -0500 + +procmeter3 (3.3b-4) unstable; urgency=low + + * Fixed up man pages removing newlines that confused lexgrog. + * Provided a real package as first alternate for xaw build-dep. + Closes: #170002 + + -- Joey Hess Thu, 21 Nov 2002 15:14:31 -0500 + +procmeter3 (3.3b-3) unstable; urgency=low + + * Patched longrun module to work with new glibc under which pread offsets + were wrapping around. + + -- Joey Hess Tue, 22 Oct 2002 18:18:56 -0400 + +procmeter3 (3.3b-2) unstable; urgency=low + + * Fixed RC_PATH breakage. + + -- Joey Hess Sun, 25 Aug 2002 16:07:54 -0400 + +procmeter3 (3.3b-1) unstable; urgency=low + + * New upstream, incorporating my new modules. + * Noved everything out of the X11R6 directory. + + -- Joey Hess Sun, 25 Aug 2002 16:02:21 -0400 + +procmeter3 (3.3a-10) unstable; urgency=low + + * Debhelper v4. + + -- Joey Hess Thu, 13 Jun 2002 17:10:18 -0400 + +procmeter3 (3.3a-9) unstable; urgency=low + + * Updated acpi.c from wmbattery 2.10. Cf #149715 + + -- Joey Hess Tue, 11 Jun 2002 22:57:33 -0400 + +procmeter3 (3.3a-8) unstable; urgency=low + + * Corrected segfault if there is a /proc/acpi/ without a status file in it. + How that can happen, I do not know. Closes: #148671 + + -- Joey Hess Fri, 31 May 2002 21:32:19 -0400 + +procmeter3 (3.3a-7) unstable; urgency=low + + * Fixed a crash if there is ACPI support, but no battery info. + + -- Joey Hess Sun, 14 Apr 2002 23:15:37 -0400 + +procmeter3 (3.3a-6) unstable; urgency=low + + * Added an ACPI module. + + -- Joey Hess Sun, 7 Apr 2002 01:50:25 -0500 + +procmeter3 (3.3a-5) unstable; urgency=low + + * Added a transmeta crusoe longrun module. + + -- Joey Hess Thu, 4 Apr 2002 22:26:58 -0500 + +procmeter3 (3.3a-4) unstable; urgency=low + + * Better wireless link underflow detection. + + -- Joey Hess Fri, 15 Mar 2002 23:06:37 -0500 + +procmeter3 (3.3a-3) unstable; urgency=low + + * This includes the two patches in -2, notably wireless stats support. Both + are accepted upstream, and I've had some requests for them, and a new + version is slow in coming, so.. + + -- Joey Hess Wed, 13 Mar 2002 23:08:18 -0500 + +procmeter3 (3.3a-2) unstable; urgency=low + + * (Never released) + * Wrote and added wireless network device module, also sent upstream of + course. + * Added ability to set clock to 12 hour format by putting "12" in its + options. Patch sent upstream, and accepted. + + -- Joey Hess Mon, 29 Oct 2001 16:21:12 -0500 + +procmeter3 (3.3a-1) unstable; urgency=low + + * New upstream. + + -- Joey Hess Sun, 27 May 2001 10:46:52 -0400 + +procmeter3 (3.3-4) unstable; urgency=low + + * Patch to fix crash/hang problems on systems with 5 block devices. + Fixes half of #85354, which I have forwarded upstream. + * Debhelper v3. + + -- Joey Hess Sat, 10 Feb 2001 00:34:07 -0800 + +procmeter3 (3.3-3) unstable; urgency=low + + * Added build-depends on xlibs-dev, Closes: #80184 + This should be redundant, since on i386 anyway, xlib6g-dev (which it + already build-depends on) depends on xlibs-dev. Whatever. This will + wake the m68k guys up and have them try to build it again, hopefully on + a system that is running unstable, not some ancient system that still + has xpm4g-dev. + + -- Joey Hess Wed, 7 Feb 2001 15:27:29 -0800 + +procmeter3 (3.3-2) unstable; urgency=low + + * Tightened gtk build dep, Closes: #81929 + + -- Joey Hess Thu, 11 Jan 2001 10:35:52 -0800 + +procmeter3 (3.3-1) unstable; urgency=low + + * New upstream with gtk support. + * For now, both binaries will be built and put in the same package. + * Added to build depends. + + -- Joey Hess Sat, 6 Jan 2001 01:44:55 -0800 + +procmeter3 (3.2b-1) unstable; urgency=low + + * New upstream with more 2.4 fixes. + + -- Joey Hess Thu, 14 Dec 2000 11:31:30 -0800 + +procmeter3 (3.2a-1) unstable; urgency=low + + * New upstream. + - Use a default font if the user specified one fails, Closes: #54093 + - Handle kernel version 2.4.0 with new format for /proc/stat, Closes: #70443 + + -- Joey Hess Mon, 23 Oct 2000 11:01:24 -0700 + +procmeter3 (3.2-1) unstable; urgency=low + + * New upstream. + + -- Joey Hess Sun, 12 Dec 1999 17:09:46 -0800 + +procmeter3 (3.1c-4) unstable; urgency=low + + * Build deps. + + -- Joey Hess Sat, 4 Dec 1999 15:23:32 -0800 + +procmeter3 (3.1c-3) unstable; urgency=low + + * A bug in my build system caused a non-orig .tar.gz to be uploaded. + Reupload full source. + + -- Joey Hess Thu, 30 Sep 1999 14:48:21 -0700 + +procmeter3 (3.1c-2) unstable; urgency=low + + * FHS + + -- Joey Hess Mon, 6 Sep 1999 16:25:55 -0700 + +procmeter3 (3.1c-1) unstable; urgency=low + + * New upstream version, fixes SMP cpu problem, Closes: #42600. + + -- Joey Hess Wed, 25 Aug 1999 15:18:08 -0700 + +procmeter3 (3.1b-3) unstable; urgency=low + + * Do not use the evil that is fakeroot (right now). + + -- Joey Hess Sun, 8 Aug 1999 17:52:04 -0700 + +procmeter3 (3.1b-2) unstable; urgency=low + + * Corrected modules path in /etc/procmeterrc. + * Procmeter can now actually find and use /etc/procmeterrc. + * This fixes 2/3 of bug #42600. + + -- Joey Hess Fri, 6 Aug 1999 21:22:11 -0700 + +procmeter3 (3.1b-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Mon, 28 Jun 1999 17:09:30 -0700 + +procmeter3 (3.1-3) unstable; urgency=low + + * Maybe fixed problem with it looking in /usr/local/ + + -- Joey Hess Wed, 17 Mar 1999 15:47:35 -0800 + +procmeter3 (3.1-2) unstable; urgency=low + + * Rebuild to fix odd corrupted binary problem (Closes: #34665). + + -- Joey Hess Tue, 16 Mar 1999 14:49:43 -0800 + +procmeter3 (3.1-1) unstable; urgency=low + + * New upstream release + + -- Joey Hess Sun, 7 Mar 1999 22:12:15 -0800 + +procmeter3 (3.0a-5) unstable; urgency=low + + * Spelling fix. + + -- Joey Hess Thu, 4 Feb 1999 16:19:04 -0800 + +procmeter3 (3.0a-4) frozen unstable; urgency=low + + * Reupload with source, which was accidentially left out. + + -- Joey Hess Mon, 2 Nov 1998 12:51:34 -0800 + +procmeter3 (3.0a-3) unstable; urgency=low + + * Reupload with source. Oops. + + -- Joey Hess Sat, 24 Oct 1998 15:59:30 -0700 + +procmeter3 (3.0a-2) unstable; urgency=low + + * Patched up to version 3.0a. No more log module errors (#28088). + + -- Joey Hess Sat, 24 Oct 1998 13:42:40 -0700 + +procmeter3 (3.0-1) unstable; urgency=low + + * New upstream release. Complete re-write and redesign. + * Changed package name to procmeter3 so it can co-exist with procmeter 2.x, + which I expect some people will want to continue to use because of + features it has that procmeter3 lacks. + + -- Joey Hess Tue, 13 Oct 1998 12:46:25 -0700 + +procmeter (2.4c-1) unstable; urgency=low + + * New upstream release, fixes network stats for kernel 2.1.90. + + -- Joey Hess Sat, 21 Mar 1998 12:42:07 -0800 + +procmeter (2.4b-4) unstable; urgency=low + + * Fixed i before e except after c error (#19004). + + -- Joey Hess Thu, 5 Mar 1998 17:06:58 -0800 + +procmeter (2.4b-3) unstable; urgency=low + + * Wrote man pages for procmeter-xlog and start-procmeter. + + -- Joey Hess Tue, 24 Feb 1998 22:14:55 -0800 + +procmeter (2.4b-2) unstable; urgency=low + + * Updated fsf address. + + -- Joey Hess Mon, 9 Feb 1998 13:35:37 -0800 + +procmeter (2.4b-1) unstable; urgency=low + + * New upstream release. (With fixes for kernel 2.1.84.) + + -- Joey Hess Thu, 5 Feb 1998 16:46:02 -0800 + +procmeter (2.4a-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Wed, 28 Jan 1998 10:22:30 -0500 + +procmeter (2.4-1) unstable; urgency=low + + * New upstream release. Fixes bug #16104 (clock skip not handled + gracefully) and #16108 (spkt / fpkt asymmetry) + * Use debhelper. + * Removed suggests: perl, becuase perl-base is all that is really needed. + + -- Joey Hess Sat, 10 Jan 1998 13:22:22 -0500 + +procmeter (2.3a-6) unstable; urgency=low + + * Fixed bug in menu file. + + -- Joey Hess Fri, 12 Sep 1997 20:57:00 -0400 + +procmeter (2.3a-5) unstable; urgency=low + + * For some reason, last version still depended on libc6. Rebuilt procmeter + to fix this (#12811). + + -- Joey Hess Thu, 11 Sep 1997 13:27:38 -0400 + +procmeter (2.3a-4) unstable; urgency=low + + * Rebuilt with all libc6 libs now. + * Suggest perl, so logtail and procmeter-xlog will work. + + -- Joey Hess Mon, 8 Sep 1997 14:27:14 -0400 + +procmeter (2.3a-3) unstable; urgency=low + + * Only install one copy of contrib/README file. + * Fixed rotate protection in logtail. + + -- Joey Hess Sat, 6 Sep 1997 01:03:59 -0400 + +procmeter (2.3a-2) unstable; urgency=low + + * Fixed logtail pattern matching. + + -- Joey Hess Fri, 5 Sep 1997 14:50:23 -0400 + +procmeter (2.3a-1) unstable; urgency=low + + * New upstream release. + * Lost version 2.3-1 somehow, so merged all changes from that version back + in. + * Modifications to logtail to make it start faster. + * Added start-procmeter to the menu file, and added longtitles. + + -- Joey Hess Fri, 5 Sep 1997 13:23:55 -0400 + +procmeter (2.3-1) unstable; urgency=low + + * New upstream release (lots of great new features in this one) + * Includes ethernet collision meter, fixes bug #11931 + * Use pristine sources. + * Install contrib/README as README.contrib in /usr/doc/procmeter. + * Built with libc6, but will need to be rebuilt later when libc6 xlib is + available. + + -- Joey Hess Fri, 22 Aug 1997 00:20:47 -0400 + +procmeter (2.2b-1) unstable; urgency=low + + * Fakeroot and sudo fixes. + * Run dpkg-gencontrol after debstd, and delete substvars during clean. + * Converted menu file to new format. + * Included ChangeLog-1 in the package. + * New upstream release. + + -- Joey Hess Sun, 3 Aug 1997 19:42:26 -0400 + +procmeter (2.2a-1) unstable; urgency=routine + + * New upstream release. + + -- Joey Hess Sat, 22 Mar 1997 14:17:51 -0500 + +procmeter (2.2-5) unstable; urgency=routine + + * Previous version made procmeter dependant on nextaw. Removed that + dependancy. + * Moved into section utils. + + -- Joey Hess Mon, 13 Jan 1997 00:33:02 -0500 + +procmeter (2.2-4) unstable; urgency=low + + * Moved into section admin. + * Moved menu item into Apps/System, and make procmeter display load + average on startup by default when run from the menu item. + + -- Joey Hess Thu, 9 Jan 1997 20:10:19 -0500 + +procmeter (2.2-3) unstable; urgency=low + + * Moved menu entry into /System + * Routine update of debian/rules: + Use build-stamp instead of build. + + -- Joey Hess Wed, 1 Jan 1997 15:20:41 -0500 + +procmeter (2.2-2) unstable; urgency=low + + * Added a menu file. + * Routine update of debian/rules: + New email address. + + -- Joey Hess Tue, 24 Dec 1996 20:30:51 -0500 + +procmeter (2.2-1) unstable; urgency=low + + * Routine update of debian/rules (use debmake). + * New upstream release. + + -- Joey Hess Mon, 4 Nov 1996 10:42:49 -0500 + +procmeter (2.1-3) unstable; urgency=low + + * Routine update of debian/rules. + * Now registers itself with install-fvwm2menu. + + -- Joey Hess Sun, 6 Oct 1996 14:45:53 -0400 + +procmeter (2.1-2) unstable; urgency=low + + * Updated to new source format and standards-version + + -- Joey Hess Sun, 8 Sep 1996 17:15:17 -0400 + +procmeter (2.1-1) unstable; urgency=low + + * New upstream version + + -- Joey Hess Sat, 2 Sep 1996 16:02:23 -0400 + +procmeter (2.0-2) unstable; urgency=low + + * fixed "Unexpected 'ctxt' line in the '/proc/stat' file." bug. + * routine debian.build update + * changed priority to optional + + -- Joey Hess Fri, 23 Aug 1996 15:37:25 -0400 + +procmeter (2.0-1) unstable; urgency=low + + * Initial release + + -- Joey Hess Wed, 21 Aug 1996 15:37:25 -0400 --- procmeter3-3.4e.orig/debian/compat +++ procmeter3-3.4e/debian/compat @@ -0,0 +1 @@ +4 --- procmeter3-3.4e.orig/debian/control +++ procmeter3-3.4e/debian/control @@ -0,0 +1,31 @@ +Source: procmeter3 +Section: utils +Priority: optional +Build-Depends: debhelper (>= 4), libgtk1.2-dev, libx11-dev, libxt-dev, x-dev, libxaw7-dev | libxaw-dev, dpkg-dev (>= 1.9.0) +Maintainer: Joey Hess +Standards-Version: 3.6.2 + +Package: procmeter3 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: graphical system status monitor + ProcMeter displays constantly updating graphs of system information. + Many different graphs are supported, including: + . + APM and ACPI information. + Mailbox monitoring. + Date, time, uptime. + Amount of free and used disk space. + Size, number of lines, rate of growth of log files. + Amount of used and free memory and swap. + Traffic on network devices. + Load average, number of processes running and starting. + Low level system statistics like CPU usage, disk usage and swapping. + CPU clock speed. + Wireless network link quality. + . + As if all that wasn't enough, procmeter is designed to be easily extendable + via plugins. + . + Procmeter can use either the Athena or the GTK widgets. It also supports + display on small LCD screens using the linux lcdproc driver. --- procmeter3-3.4e.orig/debian/copyright +++ procmeter3-3.4e/debian/copyright @@ -0,0 +1,29 @@ +This is a Debian prepackaged version of the procmeter3 utility. + +This package was put together by Joey Hess , using +sources from the procmeter web page at + http://www.gedanken.demon.co.uk/procmeter3/ + +The following copyright applies to this package: + + Author & Copyright + ------------------ + + Andrew M. Bishop + + Procmeter Version 3.0 Written August - September 1998 + Procmeter Version 3.1 Written February - March 1999 + Procmeter Version 3.2 Written August - December 1999 + Procmeter Version 3.3 Written August 2000 - January 2001 + + email: amb@gedanken.demon.co.uk [Please put procmeter in the subject line] + + This program is Copyright Andrew M. Bishop 1994,95,96,97,98,99,2000,01,02 + and distributed under GPL. + + + Some modules were written by Joey Hess , a long time supporter + of the program: wireless, longrun and acpi. + +On Debian systems, the complete text of the GPL is in +/usr/share/common-licenses/GPL --- procmeter3-3.4e.orig/debian/menu +++ procmeter3-3.4e/debian/menu @@ -0,0 +1,3 @@ +?package(procmeter3):needs="x11" section="Apps/System" title="Procmeter3" \ + longtitle="Procmeter3 system meter" \ + command="procmeter3 load" --- procmeter3-3.4e.orig/debian/rules +++ procmeter3-3.4e/debian/rules @@ -0,0 +1,45 @@ +#!/usr/bin/make -f + +build: build-stamp +build-stamp: + dh_testdir + $(MAKE) all INSTDIR=/usr RC_PATH=/etc + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + -$(MAKE) -i clean + dh_clean gprocmeter3 procmeter3 procmeter3-log procmeter3-lcd \ + .procmeterrc.install + +binary-indep: build + +binary-arch: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install \ + INSTDIR=`pwd`/debian/procmeter3/usr \ + RC_PATH=`pwd`/debian/procmeter3/etc + dh_installdocs README + dh_installchangelogs -k ChangeLog + cp modules/README \ + debian/procmeter3/usr/share/doc/procmeter3/README.modules + cp modules/ChangeLog\ + debian/procmeter3/usr/share/doc/procmeter3/ChangeLog.modules + dh_installexamples modules/template.c + 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 --- procmeter3-3.4e.orig/debian/watch +++ procmeter3-3.4e/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.gedanken.demon.co.uk/procmeter3/ .*/procmeter3-(.*).tgz --- procmeter3-3.4e.orig/man/gprocmeter3.1 +++ procmeter3-3.4e/man/gprocmeter3.1 @@ -14,7 +14,6 @@ .TH GPROCMETER3 1 "November 30, 2002" .SH NAME - gprocmeter3 \- A user friendly system monitoring program. .SH SYNOPSIS --- procmeter3-3.4e.orig/man/procmeter3_modules.1 +++ procmeter3-3.4e/man/procmeter3_modules.1 @@ -11,10 +11,9 @@ .\" any higher version. See section COPYING of the GNU Public license .\" for conditions under which this file may be redistributed. .\" -.TH PROCMETER3_MODULES 4 "April 4, 2004" +.TH PROCMETER3_MODULES 1 "April 4, 2004" .SH NAME - procmeter3 modules \- The modules that are used by the procmeter3, gprocmeter3, procmeter3-log and procmeter3-lcd programs. --- procmeter3-3.4e.orig/man/procmeter3-lcd.1 +++ procmeter3-3.4e/man/procmeter3-lcd.1 @@ -14,7 +14,6 @@ .TH PROCMETER3-LCD 1 "April 6, 2003" .SH NAME - procmeter3-lcd \- A system monitoring / logging program. .SH SYNOPSIS --- procmeter3-3.4e.orig/man/procmeter3-log.1 +++ procmeter3-3.4e/man/procmeter3-log.1 @@ -14,7 +14,6 @@ .TH PROCMETER3-LOG 1 "November 30, 2002" .SH NAME - procmeter3-log \- A system monitoring / logging program. .SH SYNOPSIS --- procmeter3-3.4e.orig/man/procmeter3.1 +++ procmeter3-3.4e/man/procmeter3.1 @@ -14,7 +14,6 @@ .TH PROCMETER3 1 "November 30, 2002" .SH NAME - procmeter3 \- A user friendly system monitoring program. .SH SYNOPSIS --- procmeter3-3.4e.orig/man/procmeterrc.5 +++ procmeter3-3.4e/man/procmeterrc.5 @@ -14,7 +14,6 @@ .TH PROCMETERRC 5 "September 7, 2004" .SH NAME - The \.procmeterrc configuration file for procmeter3, gprocmeter3, procmeter3-log and procmeter3-lcd programs. --- procmeter3-3.4e.orig/modules/Makefile +++ procmeter3-3.4e/modules/Makefile @@ -51,7 +51,7 @@ .PHONY : clean distclean clean : - -rm -f *.o *~ core + -rm -f *.o *~ core *.so distclean : clean -rm -f *.so @@ -62,9 +62,9 @@ install : install -d $(MOD_PATH) - install -d $(LIB_PATH)/example +# install -d $(LIB_PATH)/example for module in *.so ; do \ [ $$module = template.so ] || install -m 755 $$module $(MOD_PATH) ;\ done - install -m 644 README $(LIB_PATH)/example - install -m 644 template.c $(LIB_PATH)/example +# install -m 644 README $(LIB_PATH)/example +# install -m 644 template.c $(LIB_PATH)/example --- procmeter3-3.4e.orig/Makefile +++ procmeter3-3.4e/Makefile @@ -15,19 +15,19 @@ # Paths # INSTDIR - the default root directory for the package -INSTDIR=/usr/local +INSTDIR=/usr/ # MANDIR - the directory to install man pages to -MANDIR=$(INSTDIR)/man +MANDIR=$(INSTDIR)/share/man # LIB_PATH - the root dir for library files -LIB_PATH=$(INSTDIR)/lib/X11/ProcMeter3 +LIB_PATH=$(INSTDIR)/lib/ProcMeter3 # MOD_PATH - the path modules are stored in MOD_PATH=$(LIB_PATH)/modules # RC_PATH - file the procmeterrc is stored in -RC_PATH=$(LIB_PATH) +RC_PATH=/etc # Programs @@ -153,7 +153,6 @@ [ ! -f $(RC_PATH)/.procmeterrc ] || mv $(RC_PATH)/.procmeterrc $(RC_PATH)/procmeterrc @[ ! -f $(RC_PATH)/procmeterrc ] || (echo "" ; echo "*** The $(RC_PATH)/procmeterrc file has not been installed (it already exists)." ; echo "") [ -f $(RC_PATH)/procmeterrc ] || install -m 644 procmeterrc.install $(RC_PATH)/procmeterrc - install -m 644 procmeterrc.install $(RC_PATH) # - install -d $(LIB_PATH)/include - install -m 644 procmeter.h $(LIB_PATH)/include + install -d $(INSTDIR)/include + install -m 644 procmeter.h $(INSTDIR)/include --- procmeter3-3.4e.orig/procmeterp.h +++ procmeter3-3.4e/procmeterp.h @@ -25,11 +25,11 @@ /* The file locations. */ #ifndef INSTDIR -#define INSTDIR "/usr/local" +#define INSTDIR "/usr/" #endif #ifndef LIB_PATH -#define LIB_PATH INSTDIR "/lib/X11/ProcMeter3" +#define LIB_PATH INSTDIR "/lib/ProcMeter3" #endif #ifndef MOD_PATH #define MOD_PATH LIB_PATH "/modules"