[Pkg-wmaker-commits] [wmacpi] 62/105: Imported Debian patch 2.2~rc5-2
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 a3522b3af147b9164968c8faee1d2cda0cd2c67f
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Oct 13 19:40:05 2013 -0500
Imported Debian patch 2.2~rc5-2
---
debian/changelog | 229 +++++++++++++++++---------------
debian/compat | 2 +-
debian/control | 8 +-
debian/copyright | 76 ++++++-----
debian/manpages | 2 +
debian/patches/fix_compiler_flags.patch | 37 ++++++
debian/patches/series | 1 +
debian/rules | 78 +----------
debian/watch | 3 +-
9 files changed, 212 insertions(+), 224 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6323f0d..069ef50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,29 @@
+wmacpi (2.2~rc5-2) unstable; urgency=low
+
+ * New maintainer. (Closes: #688533)
+ * debian/compat:
+ + Bump debhelper version to 9.
+ * debian/control:
+ + Bump Standards-Version to 3.9.4, no changes required.
+ + Add Breaks: acpi (both install /usr/bin/acpi).
+ * debian/copyright:
+ + Update to copyright format 1.0.
+ * debian/rules:
+ + Simplify to debhelper 7 style.
+ * debian/patches:
+ + Fix compiler flags to harden binaries.
+
+ -- Doug Torrance <dtorrance at monmouthcollege.edu> Sun, 13 Oct 2013 19:40:05 -0500
+
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.
+ + Bump Standards-Version to 3.9.2, no changes required.
+ + Do not recommend wmaker, as dockapps can be used with
+ a number of other window managers.
+ + Drop dpatch build dependency.
* debian/rules:
+ Drop dpatch code.
@@ -16,11 +32,10 @@ wmacpi (2.2~rc5-1) unstable; urgency=low
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 build dependency 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 required.
+ Add ${misc:Depends}.
-
* debian/copyright:
+ Refer explicitly to the GPL-2 file.
@@ -29,10 +44,8 @@ wmacpi (2.2~rc4-2) unstable; urgency=low
wmacpi (2.2~rc4-1) unstable; urgency=low
* New upstream release.
-
* debian/control:
- + Bump Standards-Version to 3.8.0 (no changes).
-
+ + Bump Standards-Version to 3.8.0, no changes required.
* debian/patches/10_man_no_acpi.dpatch:
+ Updated; add a patch description.
@@ -50,7 +63,7 @@ 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).
+ level, charge level, or capacity percentage. (Closes: #465388)
-- Julien BLACHE <jblache at debian.org> Wed, 13 Feb 2008 22:09:30 +0100
@@ -58,9 +71,9 @@ 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).
+ fixes (mostly graphical glitches). (Closes: #463446)
* debian/control:
- + Bump Standards-Version to 3.7.3 (no changes).
+ + Bump Standards-Version to 3.7.3, no changes required.
+ Move homepage to Homepage: field.
* debian/copyright:
+ Added proper copyrights.
@@ -76,21 +89,21 @@ wmacpi (2.2~rc1-2) unstable; urgency=low
wmacpi (2.2~rc1-1) unstable; urgency=low
- * Adopting wmacpi (closes: #420091).
+ * New maintainer. (Closes: #420091)
* New upstream release.
- + Now more friendly with non-WindowMaker window managers
- (closes: #280495, #293546).
- + Fixed redraw logic (closes: #423712).
+ + Improve handling with non-WindowMaker window managers.
+ (Closes: #280495, #293546)
+ + Fix redraw logic. (Closes: #423712)
* debian/copyright:
- + Updated download URL (closes: #429698).
- + Updated author's email address.
+ + Update download URL. (Closes: #429698)
+ + Update author's email address.
* debian/control:
- + Updated URL.
- + Build-Depends: dpatch.
+ + Update URL.
+ + Add Build-Depends: dpatch.
* debian/rules:
+ Add dpatch stuff.
* debian/menu:
- + Moved menu entry to Applications/System/Monitoring.
+ + Move 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.
@@ -109,53 +122,52 @@ wmacpi (2.1-9) unstable; urgency=low
* 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.
+ + 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.
+ + 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.
+ * Orphan package.
-- 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
+ * New upstream release.
+ + 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.
+ + Slight modification of libdockapp0.6 patch.
* Makefile:
- - Removed inclusion of libXext and libXpm as suggested at
+ + 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.
+ + Bump Standards-Version to 3.7.2.0, no changes required.
+ + Remove 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.
+ + Fix 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
@@ -163,116 +175,118 @@ wmacpi (2.1-5) unstable; urgency=low
wmacpi (2.1-4) unstable; urgency=low
* wmacpi.c:
- - Added compatibility patch for libdockapp 0.6.x, closes: #350445.
+ + Add 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.
+ + Change build dependencies due to xlibs-dev transition.
* debian/copyright:
- - Updated postal address of the FSF.
+ + Update mail 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.
+ + Update to reflect new download location.
* debian/control:
- - Added amd64 to Architecture, closes: #323456.
- - Bumped Standards-Version to 3.6.2.0.
+ + Add amd64 to Architecture field in debian/control. (Closes: #323456)
+ + Bump Standards-Version to 3.6.2.0, no changes required.
* debian/menu:
- - Capitalised title to "Wmacpi", closes: #320613.
+ + Fix capitalisation of application title in debian/menu. (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.
+ * New upstream release.
* debian/control:
- - Changed Build-Dependency on libdockapp-dev to (>=1:0.5.0-1), thus
- closes: #286663, #292599, #292115.
+ + Change build dependency on libdockapp-dev to (>=1:0.5.0-1).
+ (Closes: #286663, #292599, #292115)
* wmacpi.1:
- - Unskewed section "AUTHOR" and updated dates, thus closes: #280082.
+ + Unskew section "AUTHOR" and update dates. (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.
+ * New upstream release.
+ + Compute the discharge rate when ACPI does not provide it.
+ (Closes: #228047)
* wmacpi.1:
- - Purged stuff for the command line tool "acpi" which is not shipped
- with Debian, thus closes: #276712.
+ + Purge stuff for the command line tool "acpi" which is not shipped
+ with Debian. (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.
+ * New upstream release.
+ + Port wmacpi to use libdockapp. (Closes: #227819)
* debian/control:
- - Added Build-Dependency on libdockapp-dev.
+ + Add build dependency to 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.
+ * New upstream release.
+ + Make parsing of ACPI information more robust. (Closes: #250729)
* debian/control:
- - Bumped Standards-Version to 3.6.1.1.
+ + Bump Standards-Version to 3.6.1.1, no changes required.
* debian/control:
- - The maintainer finally has become a DD and therefore a change of the
- email address was needed.
+ + Update maintainer's email address.
-- 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.
+ * New upstream release.
+ + Improve semantics of the "-b" option. (Closes: #226039)
+ + Improve error handling when ACPI isn't properly configured.
+ (Closes: #229746)
+ + Add option to disable scrolling in text messages. (Closes: #242901)
+ + Add patch for proper file handling. (Closes: #245024)
+ + Allow periodic reinitialization of battery and AC adapter information
+ to detect when the battery has been replaced. (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.
+ + Re-add the option to enable acoustic low battery warning.
+ (Closes: #226039)
+ * Remove debian/wmacpi.1, upstream ships its own manpage now.
-- 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.
+ * New upstream maintainer.
+ + Friendly takeover of wmacpi. This is a complete rewrite, because
+ the previous version does not work well with kernels with a recent
+ implementation of ACPI.
+ + Fix an issue where wmacpi would not correctly dock
+ in Window Maker. (Closes: #218017)
+ + Fix an issue where wmacpi would not detect the first battery
+ BAT1 and always use BAT2 as the first battery. (Closes: #204723)
* 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
+ + Change priority back to "extra", because ACPI itself is still
+ experimental in the kernel.
+ + Bump Standards-Version to 3.6.1.0.
+ + Modify the description to reflect new situation of upstream and
kernel support.
* debian/copyright:
- - Included mention of new upstream.
+ + Include mention of new upstream.
* debian/wmacpi.1:
- - Modified man page to reflect new options and upstream maintainer.
+ + Modify man page to reflect new options and upstream maintainer.
* debian/README.Debian:
- - Freshly created README which describes the upstream takeover a little
+ + 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
@@ -280,38 +294,37 @@ wmacpi (1.99-1) unstable; urgency=low
wmacpi (1.34-1) unstable; urgency=low
* New maintainer.
- * New upstream release (closes: #143387).
+ * 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".
+ + Update description.
+ + Bump Standards-Version to 3.5.9.
+ + Bump build-dependency on debhelper to >= 4.
+ + Change priority to "optional".
+ + Add "wmaker" to Recommends.
* debian/compat:
- - Introduced this file and set its contents to "4".
+ + Introduce this file and set its contents to "4".
* debian/copyright:
- - Updated maintainer and homepage infos.
+ + Update maintainer and homepage infos.
* debian/rules:
- - Made some minor modifications to comply with policy.
+ + Make 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.
+ + Introduce this file, which seems to be currently useless, though. The
+ web server does not allow browsing in the necessary directories.
* debian/docs:
- - Included AUTHORS.
+ + Include AUTHORS.
* debian/wmacpi.1:
- - Updated man page to reflect current parameters of wmacpi.
+ + Update 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
+ * 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).
+ * Initial release. (Closes: #90347)
-- Simon Richter <Simon.Richter at phobos.fs.tum.de> Mon, 19 Mar 2001 23:26:49 +0100
-
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 6c1c725..ad4f157 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
Source: wmacpi
Section: x11
Priority: extra
-Maintainer: Julien BLACHE <jblache at debian.org>
-Build-Depends: debhelper (>= 5), libx11-dev, libxpm-dev, x11proto-core-dev,
+Maintainer: Doug Torrance <dtorrance at monmouthcollege.edu>
+Build-Depends: debhelper (>= 9), libx11-dev, libxpm-dev, x11proto-core-dev,
libxext-dev, libdockapp-dev (>= 1:0.5.0)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: http://himi.org/wmacpi/
Package: wmacpi
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: acpi
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 fd8054e..eec5a48 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,37 @@
-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 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:
-
- Copyright (C) 2000, 2001, 2002 timecop at japan.co.jp
- Tim Copperfield <timecop at japan.co.jp>, original version (<= 1.34).
-
- Copyright (C) 2003-2007 Simon Fowler <simon at himi.org>
- 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-2'.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: wmacpi
+Upstream-Contact: Simon Fowler <simon at himi.org>
+Source: http://himi.org/wmacpi/
+
+Files: *
+Copyright: 2000-2002 Tim Copperfield
+ 2003-2007 Simon Fowler
+License: GPL-2
+
+Files: debian/*
+Copyright: 2001 Simon Richter
+ 2003 Sebastian Henschel
+ 2007 Julien Blache
+ 2013 Doug Torrance
+License: GPL-2
+
+License: GPL-2
+ This program 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; either
+ version 2 of the License.
+ .
+ This program 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 the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
\ No newline at end of file
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..b1455b5
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,2 @@
+acpi.1
+wmacpi.1
\ No newline at end of file
diff --git a/debian/patches/fix_compiler_flags.patch b/debian/patches/fix_compiler_flags.patch
new file mode 100644
index 0000000..0e60126
--- /dev/null
+++ b/debian/patches/fix_compiler_flags.patch
@@ -0,0 +1,37 @@
+Description: Fix compiler flags
+ Fix Makefile so that CFLAGS and LDFLAGS are not overwritten. Compile
+ with CFLAGS and CPPFLAGS.
+
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+
+--- wmacpi-2.2~rc5.orig/Makefile
++++ wmacpi-2.2~rc5/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) -lX11 -ldockapp
++CFLAGS += $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
++LDFLAGS += $(OPT) -lX11 -ldockapp
+
+ WMSRC := wmacpi.c libacpi.c
+ HEADERS := libacpi.h wmacpi.h
+@@ -37,7 +37,7 @@ WMOBJ := $(patsubst %.c,%.o,$(filter %.c
+ -include $(WMOBJ:.o=.d)
+
+ wmacpi: $(WMOBJ)
+- $(CC) -o $@ $^ $(LDFLAGS)
++ $(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(CPPFLAGS)
+
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+@@ -47,7 +47,7 @@ CLOBJ := $(patsubst %.c,%.o,$(filter %.c
+ -include $(CLOBJ:.o=.d)
+
+ acpi: $(CLOBJ)
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^ $(CFLAGS) $(CPPFLAGS)
+ endif
+
+ # build per-file dependencies - note that -MM may not be supported
diff --git a/debian/patches/series b/debian/patches/series
index b416d91..0bdf3c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
man_no_acpi.patch
+fix_compiler_flags.patch
diff --git a/debian/rules b/debian/rules
index c89e5ac..1b40f91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,74 +1,10 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+%:
+ dh $@
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-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:
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-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
+override_dh_auto_clean:
+ make clean-all
+override_dh_auto_install:
+ install -d $(CURDIR)/debian/wmacpi/usr/bin/
+ install -pc wmacpi acpi $(CURDIR)/debian/wmacpi/usr/bin/
diff --git a/debian/watch b/debian/watch
index 76ac543..fd819b2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://himi.org/wmacpi/download/wmacpi-([^ng]*)\.tar\.bz2 debian uupdate
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
+http://himi.org/wmacpi/download/wmacpi-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
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