From 0f9946d286eb11023898a693212a902c51ab542d Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@ahs3.net>
Date: Nov 18 2014 03:09:51 +0000
Subject: Merge branch 'debian'


---

diff --git a/debian/patches/aapits-makefile.patch b/debian/patches/aapits-makefile.patch
index fe5c48a..a1bcb65 100644
--- a/debian/patches/aapits-makefile.patch
+++ b/debian/patches/aapits-makefile.patch
@@ -1,8 +1,7 @@
-Index: acpica-unix-20141107/tests/aapits/Makefile
-===================================================================
---- acpica-unix-20141107.orig/tests/aapits/Makefile
-+++ acpica-unix-20141107/tests/aapits/Makefile
-@@ -16,6 +16,7 @@ SRCS=	atexec.c atmain.c \
+diff -Naur acpica/tests/aapits/Makefile acpica-patch/tests/aapits/Makefile
+--- acpica/tests/aapits/Makefile	2014-11-07 10:48:14.000000000 -0700
++++ acpica-patch/tests/aapits/Makefile	2014-11-17 18:32:45.816167012 -0700
+@@ -16,6 +16,7 @@
  	atosxfwrap.c \
  	osunixxf.c \
  	../../source/common/ahids.c \
@@ -10,7 +9,15 @@ Index: acpica-unix-20141107/tests/aapits/Makefile
  	../../source/common/cmfsize.c \
  	../../source/common/getopt.c \
  	../../source/components/hardware/hwtimer.c \
-@@ -174,6 +175,7 @@ SRCS=	atexec.c atmain.c \
+@@ -45,6 +46,7 @@
+ 	../../source/components/disassembler/dmresrcs.c \
+ 	../../source/components/disassembler/dmutils.c \
+ 	../../source/components/disassembler/dmwalk.c \
++	../../source/components/disassembler/dmcstyle.c \
+ 	../../source/components/events/evevent.c \
+ 	../../source/components/events/evgpe.c \
+ 	../../source/components/events/evgpeblk.c \
+@@ -174,6 +176,7 @@
  	../../source/components/utilities/utexcep.c \
  	../../source/components/utilities/utfileio.c \
  	../../source/components/utilities/utglobal.c \
@@ -18,7 +25,7 @@ Index: acpica-unix-20141107/tests/aapits/Makefile
  	../../source/components/utilities/utids.c \
  	../../source/components/utilities/utinit.c \
  	../../source/components/utilities/utlock.c \
-@@ -189,6 +191,7 @@ SRCS=	atexec.c atmain.c \
+@@ -189,6 +192,7 @@
  	../../source/components/utilities/utstate.c \
  	../../source/components/utilities/utstring.c \
  	../../source/components/utilities/uttrack.c \