[Pkg-wmaker-commits] [wmmixer] 12/24: Import Debian changes 1.5-6.1

[Doug Torrance]

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

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

commit fc4eafa3db59da2e2c85cd8dc665af5758fd8600
Author: Aurelien Jarno <aurel32 at debian.org>
Date:   Sun Dec 10 21:45:54 2006 +0100

    Import Debian changes 1.5-6.1
    
    wmmixer (1.5-6.1) unstable; urgency=low
    
      * Porter NMU.
      * Added support for GNU/kFreeBSD (Closes: #332992).
---
 debian/changelog | 7 +++++++
 mixctl.h         | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f553337..47510fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wmmixer (1.5-6.1) unstable; urgency=low
+
+  * Porter NMU.
+  * Added support for GNU/kFreeBSD (Closes: #332992). 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 21:45:54 +0100
+
 wmmixer (1.5-6) unstable; urgency=low
 
   * Fix build dependencies (Closes: #346893)
diff --git a/mixctl.h b/mixctl.h
index 2750693..4acf079 100644
--- a/mixctl.h
+++ b/mixctl.h
@@ -23,8 +23,8 @@
 #ifdef __NetBSD__
 #include <soundcard.h>
 #endif
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <sys/soundcard.h>
 #endif
 #ifdef __linux__
 #include <linux/soundcard.h>

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