[Pkg-wmaker-commits] [wmacpi] 41/105: Imported Debian patch 2.1-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 18 01:13:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmacpi.
commit 67f0c6177a20769b8e09db41ec35a52fdb38d32b
Merge: c471886 c74c0fa
Author: Sebastian Henschel <shensche at debian.org>
Date: Wed Feb 2 09:56:55 2005 +0100
Imported Debian patch 2.1-1
AUTHORS | 3 +
CVS/Entries | 8 -
CVS/Repository | 1 -
CVS/Root | 1 -
ChangeLog | 270 +++++++++++++
INSTALL | 34 +-
Makefile | 68 +++-
README | 93 ++---
TODO | 49 +++
acpi.1 | 1 +
acpi.c | 128 ++++++
debian/CVS/Entries | 10 -
debian/CVS/Repository | 1 -
debian/CVS/Root | 1 -
debian/README.Debian | 24 ++
debian/changelog | 117 +++++-
debian/compat | 1 +
debian/control | 19 +-
debian/copyright | 10 +-
debian/docs | 3 +
debian/menu | 2 +-
debian/rules | 20 +-
debian/watch | 2 +
debian/wmacpi.1 | 53 ---
libacpi.c | 881 +++++++++++++++++++++++++++++++++-------
libacpi.h | 144 +++++++
libapm.c | 91 -----
master.xpm | 162 ++++----
master_low.xpm | 152 ++++---
wmacpi.1 | 117 ++++++
wmacpi.c | 1059 +++++++++++++++++++++++++++++++------------------
wmacpi.h | 49 +--
32 files changed, 2559 insertions(+), 1015 deletions(-)
diff --cc debian/README.Debian
index 0000000,0000000..70ebe99
new file mode 100644
--- /dev/null
+++ b/debian/README.Debian
@@@ -1,0 -1,0 +1,24 @@@
++README.Debian
++-------------
++
++The package wmacpi was taken over by another upstream without permission from
++the old upstream from version > 1.34. New upstream was not able to contact
++him, though it was asked in private and public if he would agree with it, since
++the old package seemed unmaintained for over a year and did not work well
++with recent implementations of ACPI. This was also sort of discussed on the
++mailing-list debian-devel on 2003-11-06. The only answer i got was by
++Marcelo E. Magallon:
++
++----------------------------------------------------------------------------
++
++On Thu, Nov 06, 2003 at 11:31:30AM +0100, Sebastian Henschel wrote:
++
++ > in short: i want your blessing. :)
++
++ Go, go, go!
++
++ Just package the thing as wmacpi and be happy.
++
++----------------------------------------------------------------------------
++
++So that was done in late November 2003.
diff --cc debian/changelog
index ede84b7,5778797..fb327c1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,138 +1,117 @@@
-wmacpi-ng (0.99-1) unstable; urgency=low
++wmacpi (2.1-1) unstable; urgency=low
+
- * New upstream version.
-
- -- Simon Fowler <simon at dreamcraft.com.au> Fri, 26 Sep 2003 13:48:55 +1000
-
-wmacpi-ng (0.92-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Simon Fowler <simon at dreamcraft.com.au> Tue, 23 Sep 2003 11:57:09 +1000
-
-wmacpi-ng (0.91-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Simon Fowler <simon at dreamcraft.com.au> Wed, 6 Aug 2003 18:32:11 +1000
-
-wmacpi-ng (0.90-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Simon Fowler <simon at hollie.himi.private> Wed, 16 Jul 2003 18:52:04 +1000
-
-wmacpi-ng (0.50a2-1) unstable; urgency=low
-
- * New alpha upstream version.
-
- -- Simon Fowler <simon at dreamcraft.com.au> Fri, 11 Jul 2003 14:29:44 +1000
-
-wmacpi-ng (0.50a1-1) unstable; urgency=low
-
- * New alpha upstream version.
-
- -- Simon Fowler <simon at hollie.himi.private> Thu, 10 Jul 2003 11:46:11 +1000
-
-wmacpi-ng (0.50a-1) unstable; urgency=low
-
- * New alpha upstream version.
-
- -- Simon Fowler <simon at hollie.himi.private> Thu, 10 Jul 2003 00:07:44 +1000
-
-wmacpi-ng (0.50-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Simon Fowler <simon at hollie.himi.private> Sun, 6 Jul 2003 16:50:59 +1000
-
-wmacpi-ng (0.19-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Simon Fowler <simon at hollie.himi.private> Wed, 2 Jul 2003 00:55:36 +1000
-
-wmacpi-ng (0.15-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Simon Fowler <simon at hollie.himi.private> Tue, 24 Jun 2003 00:38:26 +1000
-
-wmacpi-ng (0.14-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Simon Fowler <simon at hollie.himi.private> Tue, 24 Jun 2003 00:00:26 +1000
-
-wmacpi-ng (0.13-1) unstable; urgency=low
++ * New upstream release which closes several bugs, see below.
++ * debian/control:
++ - Changed Build-Dependency on libdockapp-dev to (>=1:0.5.0-1), thus
++ closes: #286663, #292599, #292115.
++ * wmacpi.1:
++ - Unskewed section "AUTHOR" and updated dates, thus closes: #280082.
+
- * New upstream version.
++ -- Sebastian Henschel <shensche at debian.org> Wed, 2 Feb 2005 09:56:55 +0100
+
- -- Simon Fowler <simon at hollie.himi.private> Mon, 23 Jun 2003 23:49:05 +1000
++wmacpi (2.0-1) unstable; urgency=low
+
-wmacpi-ng (0.12-1) unstable; urgency=low
++ * New upstream release which closes: #228047.
++ * wmacpi.1:
++ - Purged stuff for the command line tool "acpi" which is not shipped
++ with Debian, thus closes: #276712.
+
- * New upstream version.
++ -- Sebastian Henschel <shensche at debian.org> Mon, 25 Oct 2004 13:25:04 +0200
+
- -- Simon Fowler <simon at hollie.himi.private> Sat, 21 Jun 2003 12:24:43 +1000
++wmacpi (1.99r7-1) unstable; urgency=low
+
-wmacpi-ng (0.11-1) unstable; urgency=low
++ * New upstream release which closes: #227819.
++ * debian/control:
++ - Added Build-Dependency on libdockapp-dev.
+
- * New upstream version.
++ -- Sebastian Henschel <shensche at debian.org> Thu, 26 Aug 2004 14:48:47 +0200
+
- -- Simon Fowler <simon at hollie.himi.private> Fri, 30 May 2003 23:42:12 +1000
++wmacpi (1.99r6-1) unstable; urgency=low
+
-wmacpi-ng (0.10-1) unstable; urgency=low
++ * New upstream release which closes: #250792.
++ * debian/control:
++ - Bumped Standards-Version to 3.6.1.1.
++ * debian/control:
++ - The maintainer finally has become a DD and therefore a change of the
++ email address was needed.
+
- * New upstream version.
++ -- Sebastian Henschel <shensche at debian.org> Mon, 2 Aug 2004 22:07:55 +0200
+
- -- Simon Fowler <simon at dreamcraft.com.au> Fri, 30 May 2003 13:35:50 +1000
++wmacpi (1.99r5-1) unstable; urgency=low
+
-wmacpi-ng (0.2a-1) unstable; urgency=low
++ * New upstream release where several bugs got smashed:
++ - Semantics of option "-b" should be sane now, closes: #226039.
++ - Failure in case of broken ACPI setup is more verbose now,
++ closes: #229764.
++ - It is possible to disable "crawling" scroll messages by an option,
++ thus closes: #242901.
++ - Added patch for proper file handling: closes: #245024.
++ - Also battery and ac_adapter information are reinitialised from time to
++ to time; most likely closes: #141422.
+
- * New upstream version.
++ -- Sebastian Henschel <shensche at kodeaffe.de> Mon, 26 Apr 2004 14:11:27 +0200
+
- -- Simon Fowler <simon at dreamcraft.com.au> Mon, 26 May 2003 22:08:45 +1000
++wmacpi (1.99r3-1) unstable; urgency=low
+
-wmacpi-ng (0.2-1) unstable; urgency=low
++ * New upstream release.
++ * Upstream put the option -b back in, thus closes: #226039.
++ * debian/wmacpi.1 deleted, because new upstream man page looks good enough
++ now.
++ * also closes: #141422 which was valid on some machines (i guess rather old
++ implementations of ACPI + hardware specific problem) for the old
++ versions < 1.99.
+
- * New version.
++ -- Sebastian Henschel <shensche at kodeaffe.de> Tue, 13 Jan 2004 13:06:37 +0100
+
- -- Simon Fowler <simon at dreamcraft.com.au> Mon, 26 May 2003 18:59:16 +1000
++wmacpi (1.99-1) unstable; urgency=low
+
-wmacpi-ng (0.1-1) unstable; urgency=low
-
- * New package, since the current version doesn't work with kernel
- 2.4.21-rc2.
-
- -- Simon Fowler <simon at dreamcraft.com.au> Mon, 26 May 2003 14:01:40 +1000
++ * New upstream maintainer, friendly takeover of the package. This is a
++ complete rewrite, because the previous version does not work well with
++ kernels with a recent implementation of ACPI.
++ Also several bugs are affected (hopefully closes: #218017,
++ closes: #204723). If not, please re-open them.
++ * debian/control:
++ - Changed priority back to "extra", because ACPI itself is still
++ experimental in the kernel.
++ - Bumped Standards-Version to 3.6.1.0.
++ - Modified the description to reflect new situation of upstream and
++ kernel support.
++ * debian/copyright:
++ - Included mention of new upstream.
++ * debian/wmacpi.1:
++ - Modified man page to reflect new options and upstream maintainer.
++ * debian/README.Debian:
++ - Freshly created README which describes the upstream takeover a little
++ bit.
++
++ -- Sebastian Henschel <shensche at kodeaffe.de> Tue, 25 Nov 2003 07:23:52 +0100
+
+ wmacpi (1.34-1) unstable; urgency=low
+
+ * New maintainer.
+ * New upstream release (closes: #143387).
+ * debian/control:
+ - Updated description.
+ - Bumped Standards-Version to 3.5.9.
+ - Updated build-dependency on debhelper to >= 4.
+ - Changed priority to "optional".
+ - Added a recommendation on "wmaker".
+ * debian/compat:
+ - Introduced this file and set its contents to "4".
+ * debian/copyright:
+ - Updated maintainer and homepage infos.
+ * debian/rules:
+ - Made some minor modifications to comply with policy.
+ * debian/watch:
+ - Introduced this file, which seems to be currently useless, though. the
+ web server does not allow browsing in the necessary directories.
+ * debian/docs:
+ - Included AUTHORS.
+ * debian/wmacpi.1:
+ - Updated man page to reflect current parameters of wmacpi.
+
+ -- Sebastian Henschel <shensche at kodeaffe.de> Sat, 19 Apr 2003 17:09:11 +0200
+
wmacpi (1.33-1) unstable; urgency=low
* New upstream release
diff --cc debian/control
index c9daac6,8b9e99f..d6fb989
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,20 +1,18 @@@
Source: wmacpi
Section: x11
-Priority: optional
-Maintainer: Simon Fowler <simon at dreamcraft.com.au>
-Build-Depends: debhelper (>= 4), xlibs-dev
-Standards-Version: 3.5.9
+Priority: extra
- Maintainer: Simon Richter <sjr at debian.org>
- Build-Depends: debhelper (>> 2.0.0), xlibs-dev
- Standards-Version: 3.2.1
++Maintainer: Sebastian Henschel <shensche at debian.org>
++Build-Depends: debhelper (>= 4), xlibs-dev, libdockapp-dev (>=1:0.5.0-1)
++Standards-Version: 3.6.1.1
Package: wmacpi
Architecture: i386
Depends: ${shlibs:Depends}
- Description: An ACPI battery monitor for WindowMaker (alpha)
- This is a battery monitor that uses ACPI to query the battery status. As
- the interface to ACPI changes rather often, this program usually only works
- with a very specific kernel version.
+ Recommends: wmaker
+ Description: An ACPI battery monitor for WindowMaker
+ This is a battery monitor that uses ACPI to query the battery status.
- This version should work with all recent kernels, both 2.4 and 2.6.
- .
- This is a reworked version to handle modern kernels, done by Simon
- Fowler <simon at dreamcraft.com.au>
++ This version should work with all recent kernels (vanilla > 2.4.21), both
++ 2.4.x and 2.6.x.
.
- This package is for kernel version 2.4.2 or greater, ACPI subsystem version
- 20010313 or greater.
+ Author: Simon Fowler <simon at dreamcraft.com.au>
+ Homepage: http://himi.org/wmacpi-ng/
diff --cc debian/copyright
index 7570dec,dfd7321..e17568d
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,9 -1,10 +1,15 @@@
This package was debianized by Simon Richter <Simon.Richter at phobos.fs.tum.de> on
Mon, 19 Mar 2001 23:26:49 +0100.
+ It was taken over by Sebastian Henschel <shensche at kodeaffe.de> on Sat, 19 Apr 2003 15:31:00 +0200.
- It was downloaded from http://www.ne.jp/asahi/linux/timecop/wmacpi-1.31.tar.gz
-It was downloaded from http://www.ne.jp/asahi/linux/timecop/
++This is a new, reworked version to work with recent kernels (vanilla > 2.4.21).
++It was downloaded from http://himi.org/wmacpi-ng/
++Upstream Author: Simon Fowler <simon at dreamcraft.com.au>
++
++The old version (<= 1.34) was downloaded from
++http://www.ne.jp/asahi/linux/timecop/ and done by Tim Copperfield
++<timecop at japan.co.jp>
- Upstream Author(s): Timecop <timecop at japan.co.jp>
-Upstream Author: Timecop <timecop at japan.co.jp>
Copyright:
diff --cc debian/docs
index e845566,9bce069..4cbc1c5
--- a/debian/docs
+++ b/debian/docs
@@@ -1,1 -1,3 +1,4 @@@
README
+ AUTHORS
-TODO
++TODO
++
diff --cc debian/menu
index 10c6503,10c6503..e2b83f2
--- a/debian/menu
+++ b/debian/menu
@@@ -1,2 -1,2 +1,2 @@@
--?package(wmacpi):needs=X11 section=Apps/System\
++?package(wmacpi):needs="X11" section="Apps/System" \
title="wmacpi" command="/usr/bin/wmacpi"
diff --cc debian/rules
index 7d4e2d8,5cc82ce..a812fdb
--- a/debian/rules
+++ b/debian/rules
@@@ -40,7 -50,8 +50,7 @@@ install: buil
dh_installdirs
# Add here commands to install the package into debian/wmacpi.
- install -o root -g root -m 755 wmacpi $(CURDIR)/debian/wmacpi/usr/bin/
+ install -o root -g root -m 755 wmacpi $(INSTALLDIR)/usr/bin/
-# install -o root -g root -m 755 acpi-ng $(INSTALLDIR)/usr/bin/
# Build architecture-independent files here.
@@@ -59,7 -70,7 +69,7 @@@ binary-arch: build instal
# dh_installpam
# dh_installinit
# dh_installcron
- dh_installmanpages
- dh_installman wmacpi.1 # acpi.1
++ dh_installman wmacpi.1
# dh_installinfo
# dh_undocumented
dh_installchangelogs ChangeLog
diff --cc debian/watch
index 0000000,ff95adf..c30cb4a
mode 000000,100644..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,0 -1,2 +1,2 @@@
+ version=2
-http://www.ne.jp/asahi/linux/timecop/software/wmacpi-(.*)\.tar\.gz debian uupdate
++http://himi.org/wmacpi-ng/download/wmacpi-(.*)\.tar\.bz2 debian uupdate
diff --cc wmacpi.1
index 0000000,47c02c5..1f0c658
mode 000000,100644..100644
--- a/wmacpi.1
+++ b/wmacpi.1
@@@ -1,0 -1,165 +1,117 @@@
-.TH WMACPI 1 "August 15 2004"
++.TH WMACPI 1 "February 02 2005"
+ .SH NAME
+ wmacpi \- Battery status monitor for systems supporting ACPI
-.SH NAME
-acpi \- Query battery status for systems supporting ACPI
+ .SH SYNOPSIS
+ .B wmacpi
+ [
+ .RI -c
+ value ]
+ [
+ .RI -d
+ display ]
+ [
+ .RI -m
+ battery no ]
+ [
+ .RI -s
+ sample rate ]
+ [
+ .RI -f
+ ]
+ [
+ .RI -v
+ ]
+ [
+ .RI -n
+ ]
+ [
+ .RI -w
+ ]
+ [
+ .RI -a
+ samples ]
+ [
+ .RI -V
+ ]
+ [
+ .RI -h
+ ]
+ .PP
-.B acpi
-[
-.RI -a
-samples ]
-[
-.RI -v
-]
-[
-.RI -V
-]
-]
-.RI -b
-]
-[
-.RI -r
-]
-[
-.RI -h
-]
+ .SH DESCRIPTION
+ This manual page documents briefly the
+ .B wmacpi
+ command.
+ .PP
+ .B wmacpi
+ is a program that displays the current battery status in a WindowMaker
+ dock app, on systems that support Intel's Advanced Configuration and
+ Power Interface specification (ACPI).
+ .PP
+ The program monitors a battery, displaying its current percentage
+ charge via a bar and a numeric value. It also displays the current
+ power status for the system, the time remaining (calculated based on
+ the remaining battery capacity and the current rate of power usage),
+ and a scrolling message with some hopefully useful information.
+ .PP
+ Clicking on the window cycles through the batteries that the ACPI
+ system knows about.
-.PP
-.B acpi
-queries the battery status from the command line. It prints the power
-status, the percentage remaining for each battery found, and the time
-remaining if the system is on battery, or the time remaining for each
-battery to reach full charge if the batteries are charging.
+ .SH OPTIONS
-.B wmacpi
+ .TP
+ .B \-c percentage
+ Set critical low alarm at <value>% (default: 10%).
+ .TP
+ .B \-d display
+ Set the X display to open the window on.
+ .TP
+ .B \-m battery number
+ Set the battery to monitor initially.
+ .TP
+ .B \-s sample rate
+ Set the rate at which to sample the ACPI data, in number of times per
+ minute. Minimum is 1, ie once a minute, default is 20, maximum is 600.
+ .TP
+ .B \-n
+ Disable blinking power glyph when charging. Note that it still blinks when
+ the battery reports its capacity state as critical.
+ .TP
+ .B \-f
+ Force the use of capacity mode for calculating time remaining. By defalt
+ .B wmacpi
+ will use the reported values of remaining capacity and present rate to
+ calculate the time remaining on battery. This flag will force the use
+ of the remaining capacity and time samples to calculate the present
+ rate of drain, and from there the time remaining. Note that this mode
+ of calculation generally underreports the time remaining. This mode
+ works around certain buggy ACPI BIOSes that fail to report the current
+ rate.
+ .TP
+ .B \-w
-Run wmacpi in command line mode - this operates identically to
-.B acpi
-..
++Run wmacpi in command line mode.
+ .TP
+ .B \-a num
+ Average the time remaining over num samples. This greatly improves the
+ accuracy of the reported time remaining.
+ .TP
+ .B \-v
+ Increase the verbosity of the program. Can be used more than once -
+ each successive use increases the verbosity.
+ .TP
+ .B \-V
+ Print the version information.
+ .TP
+ .B \-b
+ Enable blinking of the power glyph when charging the batteries.
+ .TP
+ .B \-r
+ Disable scrolling message.
+ .TP
+ .B \-h
+ Display help.
-.TP
-.B acpi
-.TP
-.B \-a num
-Average the time remaining over num samples. This greatly improves the
-accuracy of the reported time remaining.
-.TP
-.B \-v
-Increase the verbosity of the program, as for
-.B wmacpi
-.TP
-.B \-V
-Print the version information.
-.TP
-.B \-h
-Display help.
+ .SH AUTHOR
+ .B wmacpi
+ was originally written by Tim Copperfield <timecop at japan.co.jp>, then
+ completely rewritten after 1.34 by Simon Fowler <simon at dreamcraft.com.au>.
+ .PP
+ This manual page was originally written by Simon Richter
+ <sjr at debian.org> for the Debian GNU/Linux system, and then updated by
+ Simon Fowler.
-.br
-Last modification by Simon Fowler <simon at dreamcraft.com.au>, 2004-08-15.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmacpi.git
More information about the Pkg-wmaker-commits
mailing list