[Pkg-wmaker-commits] [wmacpi] 49/105: Imported Debian patch 2.1-9
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 fa0117da9baee35a1898d6aa3aad4b5a91502a28
Author: Guillem Jover <guillem at debian.org>
Date: Tue May 22 14:47:25 2007 +0300
Imported Debian patch 2.1-9
---
Makefile | 8 ++++----
debian/changelog | 27 +++++++++++++++++++++++++++
debian/control | 5 +++--
debian/copyright | 42 ++++++++++++++++++++++--------------------
debian/docs | 1 -
debian/rules | 51 ++++++++++++++++++---------------------------------
debian/watch | 2 +-
libacpi.c | 18 ++++++++++++------
8 files changed, 87 insertions(+), 67 deletions(-)
diff --git a/Makefile b/Makefile
index 4d53ae1..195ef78 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ BUILD_CLI = 1
#OPT = -pg -g
CC := gcc
-CFLAGS := $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
-LDFLAGS := $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext -ldockapp
+CFLAGS := $(OPT) -Wall -W -g -ansi
+LDFLAGS := $(OPT) -lX11 -lXpm -lXext -ldockapp
WMSRC := wmacpi.c libacpi.c
HEADERS := libacpi.h wmacpi.h
@@ -34,7 +34,7 @@ all: $(targets)
WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
# include per-file dependencies
-include $(WMOBJ:.o=.d)
+-include $(WMOBJ:.o=.d)
wmacpi: $(WMOBJ)
$(CC) $(LDFLAGS) -o $@ $^
@@ -44,7 +44,7 @@ wmacpi: $(WMOBJ)
ifdef BUILD_CLI
CLSRC := acpi.c libacpi.c
CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
-include $(CLOBJ:.o=.d)
+-include $(CLOBJ:.o=.d)
acpi: $(CLOBJ)
$(CC) $(LDFLAGS) -o $@ $^
diff --git a/debian/changelog b/debian/changelog
index 8847c54..b9d1287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+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.
diff --git a/debian/control b/debian/control
index 13d609b..141a07b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: wmacpi
Section: x11
Priority: extra
Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 4), libx11-dev, x-dev, libdockapp-dev (>=1:0.5.0-1)
+Build-Depends: debhelper (>= 4), libx11-dev, libxpm-dev, x11proto-core-dev,
+ x11proto-xext-dev, libdockapp-dev (>= 1:0.5.0-1)
Standards-Version: 3.7.2.0
Package: wmacpi
Architecture: i386 amd64
Depends: ${shlibs:Depends}
Recommends: wmaker
-Description: An ACPI battery monitor for WindowMaker
+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 --git a/debian/copyright b/debian/copyright
index 85537b8..2d25677 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,32 @@
-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.
+This package was debianized by Simon Richter <Simon.Richter at phobos.fs.tum.de>
+on Mon, 19 Mar 2001 23:26:49 +0100.
-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>
+It was taken over by Sebastian Henschel <shensche at kodeaffe.de>
+on Sat, 19 Apr 2003 15:31:00 +0200.
-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>
+It was downloaded from <http://himi.org/wmacpi-ng/> (the original versions
+were downloaded from <http://www.ne.jp/asahi/linux/timecop/>).
+Upstream authors:
-Copyright:
+ Tim Copperfield <timecop at japan.co.jp>, original version (<= 1.34).
+ Simon Fowler <simon at dreamcraft.com.au>, rewritten version to work with
+ recent Linux kernels (vanilla > 2.4.21).
- 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.
+License:
- 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.
+ 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.
- 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.
+ 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 --git a/debian/docs b/debian/docs
index 4cbc1c5..86e0ce2 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,3 @@
README
AUTHORS
TODO
-
diff --git a/debian/rules b/debian/rules
index a812fdb..04dd5cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,78 +12,63 @@ INSTALLDIR=$(CURDIR)/debian/wmacpi
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 = "-Wall -g -O0"
+ CFLAGS += -O0
else
- CFLAGS = "-Wall -g -O2"
+ CFLAGS += -O2
endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- touch configure-stamp
+build-indep:
-build: configure-stamp build-stamp
-build-stamp:
+build-arch:
dh_testdir
-
- # Add here commands to compile the package.
+
$(MAKE)
- touch build-stamp
+build: build-indep build-arch
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
+
-$(MAKE) clean-all
-
+
dh_clean
-install: build
+install-arch: build-arch
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-
- # Add here commands to install the package into debian/wmacpi.
+
install -o root -g root -m 755 wmacpi $(INSTALLDIR)/usr/bin/
-
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install-arch
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs
-# dh_installexamples
dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
-# dh_installcron
dh_installman wmacpi.1
-# dh_installinfo
-# dh_undocumented
dh_installchangelogs ChangeLog
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_makeshlibs
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build-indep build-arch build binary-indep binary-arch binary
+.PHONY: install-arch clean
+
diff --git a/debian/watch b/debian/watch
index cbd2db2..76ac543 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=2
+version=3
http://himi.org/wmacpi/download/wmacpi-([^ng]*)\.tar\.bz2 debian uupdate
diff --git a/libacpi.c b/libacpi.c
index 6ea74d6..b4e9dce 100644
--- a/libacpi.c
+++ b/libacpi.c
@@ -139,15 +139,20 @@ int power_init(global_t *globals)
char buf[4096];
int acpi_ver = 0;
int retval;
-
- if (!(acpi = fopen("/proc/acpi/info", "r"))) {
- pfatal("This system does not support ACPI\n");
- return 1;
+ unsigned int version_offset = 0;
+
+ if (!(acpi = fopen("/sys/module/acpi/parameters/acpica_version", "r"))) {
+ if (!(acpi = fopen("/proc/acpi/info", "r"))) {
+ pfatal("This system does not support ACPI\n");
+ return 1;
+ } else {
+ version_offset = 25;
+ }
}
/* okay, now see if we got the right version */
fread(buf, 4096, 1, acpi);
- acpi_ver = strtol(buf + 25, NULL, 10);
+ acpi_ver = strtol(buf + version_offset, NULL, 10);
pinfo("ACPI version detected: %d\n", acpi_ver);
if (acpi_ver < 20020214) {
pfatal("This version requires ACPI subsystem version 20020214\n");
@@ -169,7 +174,8 @@ int power_reinit(global_t *globals)
FILE *acpi;
int retval;
- if (!(acpi = fopen("/proc/acpi/info", "r"))) {
+ if (!(acpi = fopen("/proc/acpi/info", "r")) &&
+ !(acpi = fopen("/sys/module/acpi/parameters/acpica_version", "r"))) {
pfatal("Could not reopen ACPI info file - does this system support ACPI?\n");
return 1;
}
--
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