[Pkg-wmaker-commits] [wmbattery] 106/241: * Magic header file reordering to work around the disgusting linux-libc-dev/libc headers conflicts (#435700). Closes: #463811

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbattery.

commit 74b11e35e1cde364e0fff5fcf99d52624df84b74
Author: Joey Hess <joey at kodama.kitenet.net>
Date:   Wed Feb 27 15:08:50 2008 -0500

    * Magic header file reordering to work around the disgusting
      linux-libc-dev/libc headers conflicts (#435700). Closes: #463811
---
 debian/changelog | 7 +++++++
 simplehal.c      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 603c0fb..5f308d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wmbattery (2.38) UNRELEASED; urgency=low
+
+  * Magic header file reordering to work around the disgusting
+    linux-libc-dev/libc headers conflicts (#435700). Closes: #463811
+
+ -- Joey Hess <joeyh at debian.org>  Wed, 27 Feb 2008 15:06:21 -0500
+
 wmbattery (2.37) unstable; urgency=low
 
   * Support reconnecting to dbus if it's restarted. (AKA giant dbus-PITA)
diff --git a/simplehal.c b/simplehal.c
index 77da060..e3247c3 100644
--- a/simplehal.c
+++ b/simplehal.c
@@ -2,12 +2,12 @@
  * apm.
  */
 
-#include <apm.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <libhal.h>
+#include "apm.h"
 
 static DBusConnection *dbus_ctx = NULL;
 static LibHalContext *hal_ctx = NULL;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbattery.git