[Pkg-wmaker-commits] [wmacpi] 59/105: Imported Upstream version 2.2~rc5
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 3395626a053345ecefeffc1fdd5823cf4d114541
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Mon Nov 24 05:55:17 2014 -0600
Imported Upstream version 2.2~rc5
---
.hg_archival.txt | 2 +-
.hgtags | 2 ++
ChangeLog | 4 ++++
Makefile | 2 +-
acpi.c | 2 +-
wmacpi.c | 2 +-
6 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.hg_archival.txt b/.hg_archival.txt
index b8a6d79..812ee3b 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,2 +1,2 @@
repo: 9cde42e7fe71d3618c7c14b2f4fec73f079b283d
-node: f0f8df2eb33c81247679bd10585a3d380b03ca60
+node: 81fd4b2a1617e82f9dae26b628e5c79ac7067045
diff --git a/.hgtags b/.hgtags
index dd91897..821ffeb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -5,3 +5,5 @@ dc57f7d93d9c0c5dd8a283ca3d1d48420c12b536 v2.2rc3
4be24f89e71d83589056ccbc38376867a6a25ffa v2.2rc3-1
bfff36bca604857508fe37552acbdcfe94fad31d v2.2rc4
8f72761f2fe3aeab65e04079e6253bb00fe957dc v2.2rc4-1
+5daab1058fa0d1402cc1845a933051dd8518003c v2.2rc5
+3051f5447325d65089fa06312f5c13bbbdb8d3a9 v2.2rc5-1
diff --git a/ChangeLog b/ChangeLog
index bd3c015..bb8f0cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009 August 10 2.2rc5
+ Small Makefile fix to allow compiling on newer GCCs, supplied
+ Michael Shigorin of ALT Linux.
+
2008 November 14 2.2rc4
Change the way that we sleep/wait for activity, to use select
rather than a fixed-length sleep, supplied by Julien Blache of
diff --git a/Makefile b/Makefile
index 0572999..7ae85a2 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
-include $(WMOBJ:.o=.d)
wmacpi: $(WMOBJ)
- $(CC) $(LDFLAGS) -o $@ $^
+ $(CC) -o $@ $^ $(LDFLAGS)
# for the Debian package, we want to make building the command line tools
# optional. So, we hide all the necessary stuff here . . .
diff --git a/acpi.c b/acpi.c
index 1518449..4ecb1c0 100644
--- a/acpi.c
+++ b/acpi.c
@@ -26,7 +26,7 @@
#include "libacpi.h"
-#define ACPI_VER "2.2rc3"
+#define ACPI_VER "2.2rc5"
global_t *globals;
diff --git a/wmacpi.c b/wmacpi.c
index 057203a..22040a5 100644
--- a/wmacpi.c
+++ b/wmacpi.c
@@ -36,7 +36,7 @@
#include "libacpi.h"
#include "wmacpi.h"
-#define WMACPI_VER "2.2rc3"
+#define WMACPI_VER "2.2rc5"
/* main pixmap */
#ifdef LOW_COLOR
--
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