From ca2b0356fdf874dae9a8899be0cf8f6e28f9df33 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@ahs3.net>
Date: May 22 2015 00:02:48 +0000
Subject: Merge branch 'debian'


---

diff --git a/debian/changelog b/debian/changelog
index f9cdb5c..d13fa53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+acpica-unix (20150515-1) unstable; urgency=medium
+
+  * Upgrade to latest upstream. 
+  * Refresh patches as needed.
+
+ -- ahs3 <ahs3@debian.org>  Thu, 21 May 2015 18:00:48 -0600
+
 acpica-unix (20150410-1) unstable; urgency=medium
 
   * Upgrade to latest upstream. 
diff --git a/debian/patches/add-testing.patch b/debian/patches/add-testing.patch
index 6990ae4..36b62fa 100644
--- a/debian/patches/add-testing.patch
+++ b/debian/patches/add-testing.patch
@@ -15,7 +15,7 @@ Index: acpica-unix-20150408/Makefile
 +	$(CURDIR)/debian/run-aapits.sh $(CURDIR)/tests/aapits $(CURDIR)/generate/unix/bin
 +
 +	# misc tests
-+	$(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20150410
++	$(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20150515
 +
 +	# Template tests
 +	cd $(CURDIR)/tests/templates
diff --git a/debian/rules b/debian/rules
index 7b21c77..d14c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPP
 
 DESTDIR ?= debian/acpica-tools
 
-VERSION = 20150410
+VERSION = 20150515
 
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)