[Pkg-wmaker-commits] [wmacpi] 61/105: Imported Debian patch 2.2~rc5-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 18 01:13:45 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 59b1de1231408f4beff7b01d52f05ad44c89b078
Merge: c3d386d 3395626
Author: Julien BLACHE <jblache at debian.org>
Date: Thu Jun 2 12:34:39 2011 +0200
Imported Debian patch 2.2~rc5-1
.hg_archival.txt | 2 +-
.hgtags | 2 ++
ChangeLog | 4 ++++
Makefile | 2 +-
acpi.c | 2 +-
debian/changelog | 15 +++++++++++++++
debian/control | 5 ++---
debian/patches/00list | 1 -
.../{10_man_no_acpi.dpatch => man_no_acpi.patch} | 18 ++++++++----------
debian/patches/series | 1 +
debian/rules | 10 +++-------
debian/source/format | 1 +
wmacpi.c | 2 +-
13 files changed, 40 insertions(+), 25 deletions(-)
diff --cc debian/changelog
index 216cbde,0000000..6323f0d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,302 -1,0 +1,317 @@@
++wmacpi (2.2~rc5-1) unstable; urgency=low
++
++ * New upstream release.
++ * Switch to source format 3.0 (quilt).
++
++ * debian/control:
++ + Bump Standards-Version to 3.9.2 (no changes).
++ + Do not recommend wmaker, as dockapps can be used with a number of other
++ window managers.
++ + Drop dpatch build-dep.
++ * debian/rules:
++ + Drop dpatch code.
++
++ -- Julien BLACHE <jblache at debian.org> Thu, 02 Jun 2011 12:34:39 +0200
++
+wmacpi (2.2~rc4-2) unstable; urgency=low
+
+ * debian/control:
+ + Build-depend on libxext-dev instead of x11proto-xext-dev to account for
+ changes in the X packaging (closes: #569362).
+ + Bump Standards-Version to 3.8.4 (no changes).
+ + Add ${misc:Depends}.
+
+ * debian/copyright:
+ + Refer explicitly to the GPL-2 file.
+
+ -- Julien BLACHE <jblache at debian.org> Sat, 13 Feb 2010 09:26:32 +0100
+
+wmacpi (2.2~rc4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ * debian/control:
+ + Bump Standards-Version to 3.8.0 (no changes).
+
+ * debian/patches/10_man_no_acpi.dpatch:
+ + Updated; add a patch description.
+
+ -- Julien BLACHE <jblache at debian.org> Fri, 14 Nov 2008 19:06:56 +0100
+
+wmacpi (2.2~rc3-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/01_power_supply_and_misc_fixes.dpatch:
+ + Removed; merged upstream.
+
+ -- Julien BLACHE <jblache at debian.org> Sat, 22 Mar 2008 10:12:25 +0100
+
+wmacpi (2.2~rc1-4) unstable; urgency=low
+
+ * debian/patches/01_power_supply_and_misc_fixes.dpatch:
+ + Updated; take into account that batteries can report either their energy
+ level, charge level, or capacity percentage (closes: #465388).
+
+ -- Julien BLACHE <jblache at debian.org> Wed, 13 Feb 2008 22:09:30 +0100
+
+wmacpi (2.2~rc1-3) unstable; urgency=low
+
+ * debian/patches/01_power_supply_and_misc_fixes.dpatch:
+ + Added; add support for the power_supply class for 2.6.24+ and other misc
+ fixes (mostly graphical glitches) (closes: #463446).
+ * debian/control:
+ + Bump Standards-Version to 3.7.3 (no changes).
+ + Move homepage to Homepage: field.
+ * debian/copyright:
+ + Added proper copyrights.
+
+ -- Julien BLACHE <jblache at debian.org> Sun, 10 Feb 2008 18:37:35 +0100
+
+wmacpi (2.2~rc1-2) unstable; urgency=low
+
+ * debian/menu:
+ + Add a description.
+
+ -- Julien BLACHE <jblache at debian.org> Sun, 05 Aug 2007 21:00:40 +0200
+
+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> Sun, 05 Aug 2007 21:00:26 +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?
+ - 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/control
index fff74dd,0000000..6c1c725
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,18 -1,0 +1,17 @@@
+Source: wmacpi
+Section: x11
+Priority: extra
+Maintainer: Julien BLACHE <jblache at debian.org>
- Build-Depends: debhelper (>= 5), dpatch, libx11-dev, libxpm-dev, x11proto-core-dev,
++Build-Depends: debhelper (>= 5), libx11-dev, libxpm-dev, x11proto-core-dev,
+ libxext-dev, libdockapp-dev (>= 1:0.5.0)
- Standards-Version: 3.8.4
++Standards-Version: 3.9.2
+Homepage: http://himi.org/wmacpi/
+
+Package: wmacpi
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc: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.
+
diff --cc debian/patches/man_no_acpi.patch
index 7ed6751,0000000..cacad14
mode 100644,000000..100644
--- a/debian/patches/man_no_acpi.patch
+++ b/debian/patches/man_no_acpi.patch
@@@ -1,100 -1,0 +1,98 @@@
- #! /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: Remove references to the acpi command from the manpage as we're
- ## DP: not shipping it.
++Description: Remove references to the acpi binary from the manpage
++ We do not ship the acpi binary, so don't mention it in the manpage so
++ as to not confuse everybody.
++Author: Julien BLACHE <jblache at debian.org>
+
- @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
++Index: wmacpi-2.2~rc5/wmacpi.1
++===================================================================
++--- wmacpi-2.2~rc5.orig/wmacpi.1 2009-08-10 14:44:43.000000000 +0200
+++++ wmacpi-2.2~rc5/wmacpi.1 2011-06-02 12:35:32.447862198 +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/patches/series
index 0000000,0000000..b416d91
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++man_no_acpi.patch
diff --cc debian/rules
index dbf7452,0000000..c89e5ac
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,78 -1,0 +1,74 @@@
+#!/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: build-stamp
- build-stamp: patch-stamp
++build-stamp:
+ dh_testdir
+
+ $(MAKE)
+
+ touch build-stamp
+
- clean: real-clean unpatch
- real-clean:
++clean:
+ dh_testdir
+ dh_testroot
+
+ rm -f build-stamp
+
+ $(MAKE) clean-all
+
+ dh_clean
+
+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: 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 binary-indep binary-arch binary install clean real-clean patch unpatch
++.PHONY: build binary-indep binary-arch binary install clean
+
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
--
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