[Pkg-wmaker-commits] [wmacpi] 51/105: Imported Debian patch 2.2~rc1-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 18 01:13:44 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 90121f61ca42dd08b5cc432d08971d68afb73563
Merge: fa0117d cad4714
Author: Julien BLACHE <jblache at debian.org>
Date: Tue Jul 17 00:50:04 2007 +0200
Imported Debian patch 2.2~rc1-1
AUTHORS | 2 +-
ChangeLog | 26 ++++++++++
Makefile | 4 +-
README | 28 +++++-----
TODO | 7 ++-
acpi.c | 9 ++--
debian/README.Debian | 24 ---------
debian/changelog | 24 ++++++++-
debian/compat | 2 +-
debian/control | 8 +--
debian/copyright | 7 ++-
debian/menu | 2 +-
debian/patches/00list | 1 +
debian/patches/10_man_no_acpi.dpatch | 99 ++++++++++++++++++++++++++++++++++++
debian/rules | 32 +++++++-----
libacpi.c | 27 ++++++----
libacpi.h | 2 +-
wmacpi.1 | 58 +++++++++++----------
wmacpi.c | 55 ++++++++++++++++----
19 files changed, 297 insertions(+), 120 deletions(-)
diff --cc debian/changelog
index b9d1287,0000000..479126c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,219 -1,0 +1,241 @@@
++wmacpi (2.2~rc1-1) unstable; urgency=low
++
++ * Adopting wmacpi (closes: #420091).
++ * New upstream release.
++ + Now more friendly with non-WindowMaker window managers
++ (closes: #280495, #293546).
++ + Fixed redraw logic (closes: #423712).
++ * debian/copyright:
++ + Updated download URL (closes: #429698).
++ + Updated author's email address.
++ * debian/control:
++ + Updated URL.
++ + Build-Depends: dpatch.
++ * debian/rules:
++ + Add dpatch stuff.
++ * debian/menu:
++ + Moved menu entry to Applications/System/Monitoring.
++ * debian/patches/10_man_no_acpi.dpatch:
++ + Added; acpi is not shipped in the package, so don't document it.
++
++ -- Julien BLACHE <jblache at debian.org> Tue, 17 Jul 2007 00:50:04 +0200
++
+wmacpi (2.1-9) unstable; urgency=low
+
+ * QA upload.
+ * Add support for the new Linux 2.6 ACPI sysfs hierarchy. (Closes: #412605)
+ Thanks to Samuel “the shark” Ortiz <samuel at sortiz.org>.
+ * Remove initial preposition from the short description.
+ * Update watch file to version 3 (no changes needed).
+ * Change x-dev Build-Depends to x11proto-core-dev.
+ * Add missing Build-Depends x11proto-xext-dev and libxpm-dev.
+ * Do not use '/usr/X11R6/lib' and '/usr/X11R6/include' when compiling.
+ * Do not complain if the dependency files (.d) are not found when including
+ them in the Makefile.
+ * Clean up debian/copyright:
+ - Use 'License' instead of 'Copyright'.
+ - Add a new 'Upstream authors' section heading.
+ * Clean up debian/rules:
+ - Remove empty configure target.
+ - Move duped cflags assignments in noopt to a common assignment.
+ - Do not use a build-stamp file.
+ - Remove boilerplate comments.
+ - Add build-indep and build-arch targets. Make build depend on both.
+ - Rename install to install-arch, make it depend on build-arch.
+ - Change binary-indep to not depend on anything.
+ - Change binary-arch to depend on install-arch.
+
+ -- Guillem Jover <guillem at debian.org> Tue, 22 May 2007 14:47:25 +0300
+
+wmacpi (2.1-8) unstable; urgency=low
+
+ * Orphaned package. See you fellas.
+
+ -- Sebastian Henschel <shensche at debian.org> Fri, 20 Apr 2007 10:54:39 +1200
+
+wmacpi (2.1-7) unstable; urgency=low
+
+ * New upstream release to close several bugs, see below.
+ * debian/control:
+ - Fix display issues with newer versions of libdockapp,
+ closes: #280495, #293546
+
+ -- Sebastian Henschel <shensche at debian.org> Thu, 22 Feb 2007 17:44:08 +1300
+
+wmacpi (2.1-6) unstable; urgency=low
+
+ * wmacpi.c:
+ - Slight modification of libdockapp0.6 patch.
+ * Makefile:
+ - Removed inclusion of libXext and libXpm as suggested at
+ http://rerun.lefant.net/checklib/log.wmacpi_2.1-5.html.
- * debian/control
++ * debian/control?
+ - Bumped Standards-Version to 3.7.2.0.
+ - Removed Build-Depends on libxext-dev and libxpm-dev.
+
+ -- Sebastian Henschel <shensche at debian.org> Tue, 26 Sep 2006 13:42:52 +1200
+
+wmacpi (2.1-5) unstable; urgency=low
+
+ * wmacpi.c:
+ - Fixed previous patch which let libdockapp hijack command line
+ options from wmacpi, closes: #350887.
+
+ -- Sebastian Henschel <shensche at debian.org> Thu, 2 Feb 2006 14:20:24 +0100
+
+
+wmacpi (2.1-4) unstable; urgency=low
+
+ * wmacpi.c:
+ - Added compatibility patch for libdockapp 0.6.x, closes: #350445.
+
+ -- Sebastian Henschel <shensche at debian.org> Tue, 31 Jan 2006 09:31:47 +0100
+
+wmacpi (2.1-3) unstable; urgency=low
+
+ * debian/control:
+ - Changed build-dependencies due to xlibs-dev transition.
+ * debian/copyright:
+ - Updated postal address of the FSF.
+
+ -- Sebastian Henschel <shensche at debian.org> Thu, 1 Dec 2005 11:10:44 +0100
+
+wmacpi (2.1-2) unstable; urgency=low
+
+ * debian/watch:
+ - Updated to reflect (not-so-)new download location.
+ * debian/control:
+ - Added amd64 to Architecture, closes: #323456.
+ - Bumped Standards-Version to 3.6.2.0.
+ * debian/menu:
+ - Capitalised title to "Wmacpi", closes: #320613.
+
+ -- Sebastian Henschel <shensche at debian.org> Sun, 21 Aug 2005 11:42:59 +0200
+
+wmacpi (2.1-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.
+
+ -- Sebastian Henschel <shensche at debian.org> Wed, 2 Feb 2005 09:56:55 +0100
+
+
+wmacpi (2.0-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.
+
+ -- Sebastian Henschel <shensche at debian.org> Mon, 25 Oct 2004 13:25:04 +0200
+
+wmacpi (1.99r7-1) unstable; urgency=low
+
+ * New upstream release which closes: #227819.
+ * debian/control:
+ - Added Build-Dependency on libdockapp-dev.
+
+ -- Sebastian Henschel <shensche at debian.org> Thu, 26 Aug 2004 14:48:47 +0200
+
+wmacpi (1.99r6-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.
+
+ -- Sebastian Henschel <shensche at debian.org> Mon, 2 Aug 2004 22:07:55 +0200
+
+wmacpi (1.99r5-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.
+
+ -- Sebastian Henschel <shensche at kodeaffe.de> Mon, 26 Apr 2004 14:11:27 +0200
+
+wmacpi (1.99r3-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.
+
+ -- Sebastian Henschel <shensche at kodeaffe.de> Tue, 13 Jan 2004 13:06:37 +0100
+
+wmacpi (1.99-1) unstable; urgency=low
+
+ * 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
+
+ -- Simon Richter <sjr at debian.org> Mon, 28 May 2001 01:49:55 +0200
+
+wmacpi (1.31-1) unstable; urgency=low
+
+ * Initial Release (Closes: #90347).
+
+ -- Simon Richter <Simon.Richter at phobos.fs.tum.de> Mon, 19 Mar 2001 23:26:49 +0100
+
diff --cc debian/compat
index b8626c4,0000000..7ed6ff8
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++5
diff --cc debian/control
index 141a07b,0000000..23f8013
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,0 +1,19 @@@
+Source: wmacpi
+Section: x11
+Priority: extra
- Maintainer: Debian QA Group <packages at qa.debian.org>
- Build-Depends: debhelper (>= 4), libx11-dev, libxpm-dev, x11proto-core-dev,
++Maintainer: Julien BLACHE <jblache at debian.org>
++Build-Depends: debhelper (>= 5), dpatch, libx11-dev, libxpm-dev, x11proto-core-dev,
+ x11proto-xext-dev, libdockapp-dev (>= 1:0.5.0-1)
- Standards-Version: 3.7.2.0
++Standards-Version: 3.7.2
+
+Package: wmacpi
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}
+Recommends: wmaker
+Description: 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 (vanilla > 2.4.21), both
+ 2.4.x and 2.6.x.
+ .
+ Author: Simon Fowler <simon at dreamcraft.com.au>
- Homepage: http://himi.org/wmacpi-ng/
++ Homepage: http://himi.org/wmacpi/
diff --cc debian/copyright
index 2d25677,0000000..a2f0470
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,33 -1,0 +1,36 @@@
+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://himi.org/wmacpi-ng/> (the original versions
++It was taken over by Julien BLACHE <jblache at debian.org>
++on Tue, 17 Jul 2007 18:16:23 +0200.
++
++It was downloaded from <http://himi.org/wmacpi/> (the original versions
+were downloaded from <http://www.ne.jp/asahi/linux/timecop/>).
+
+Upstream authors:
+
+ Tim Copperfield <timecop at japan.co.jp>, original version (<= 1.34).
- Simon Fowler <simon at dreamcraft.com.au>, rewritten version to work with
++ Simon Fowler <simon at himi.org>, rewritten version to work with
+ recent Linux kernels (vanilla > 2.4.21).
+
+License:
+
+ This package 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; version 2 dated June, 1991.
+
+ This package 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 package; if not, write to Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --cc debian/menu
index 0791b92,0000000..f6d51ca
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,2 -1,0 +1,2 @@@
- ?package(wmacpi):needs="X11" section="Apps/System" \
++?package(wmacpi):needs="X11" section="Applications/System/Monitoring" \
+ title="Wmacpi" command="/usr/bin/wmacpi"
diff --cc debian/patches/00list
index 0000000,0000000..1ce3910
new file mode 100644
--- /dev/null
+++ b/debian/patches/00list
@@@ -1,0 -1,0 +1,1 @@@
++10_man_no_acpi
diff --cc debian/patches/10_man_no_acpi.dpatch
index 0000000,0000000..4ce7a8a
new file mode 100644
--- /dev/null
+++ b/debian/patches/10_man_no_acpi.dpatch
@@@ -1,0 -1,0 +1,99 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 10_man_no_acpi.dpatch by <jblache at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: No description.
++
++ at DPATCH@
++diff -urNad wmacpi-2.2rc1~/wmacpi.1 wmacpi-2.2rc1/wmacpi.1
++--- wmacpi-2.2rc1~/wmacpi.1 2007-07-13 17:26:30.000000000 +0200
+++++ wmacpi-2.2rc1/wmacpi.1 2007-07-17 00:49:21.263451607 +0200
++@@ -1,8 +1,6 @@
++ .TH WMACPI 1 "July 13 2007"
++ .SH NAME
++ wmacpi \- Battery status monitor for systems supporting ACPI
++-.SH NAME
++-acpi \- Query battery status for systems supporting ACPI
++ .SH SYNOPSIS
++ .B wmacpi
++ [
++@@ -38,26 +36,6 @@
++ [
++ .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
++@@ -76,14 +54,7 @@
++ .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, --critical=percentage
++ Set critical low alarm at <percentage>% (default: 10%).
++@@ -114,9 +85,7 @@
++ rate.
++ .TP
++ .B \-x, --cmdline
++-Run wmacpi in command line mode - this operates identically to
++-.B acpi
++-..
+++Run wmacpi in command line mode.
++ .TP
++ .B \-a, --samples=samples
++ Average the time remaining over num samples. This greatly improves the
++@@ -135,26 +104,6 @@
++ .TP
++ .B \-h, --help
++ 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. If repeated, the result is the
++-same as setting
++-.B \--verbosity
++-for
++-.B wmacpi
++-to the number of repetitions.
++-.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
diff --cc debian/rules
index 04dd5cf,0000000..dbf7452
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,74 -1,0 +1,78 @@@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
++# Include dpatch stuff.
++include /usr/share/dpatch/dpatch.make
++
+INSTALLDIR=$(CURDIR)/debian/wmacpi
+
+# These are used for cross-compiling and for saving the configure script
+# # from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
- build-indep:
-
- build-arch:
++build: build-stamp
++build-stamp: patch-stamp
+ dh_testdir
-
++
+ $(MAKE)
+
- build: build-indep build-arch
++ touch build-stamp
+
- clean:
++clean: real-clean unpatch
++real-clean:
+ dh_testdir
+ dh_testroot
-
- -$(MAKE) clean-all
-
++
++ rm -f build-stamp
++
++ $(MAKE) clean-all
++
+ dh_clean
+
- install-arch: build-arch
++install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
-
++
+ install -o root -g root -m 755 wmacpi $(INSTALLDIR)/usr/bin/
+
+# Build architecture-independent files here.
+binary-indep:
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
- binary-arch: install-arch
++binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installmenu
+ dh_installman wmacpi.1
+ dh_installchangelogs ChangeLog
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+
- .PHONY: build-indep build-arch build binary-indep binary-arch binary
- .PHONY: install-arch clean
++.PHONY: build binary-indep binary-arch binary install clean real-clean patch unpatch
+
--
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