From 5d664accd5367372aabd014092c31032a47d8f04 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@ahs3.net>
Date: Mar 21 2021 19:48:50 +0000
Subject: Merge branch 'debian'


---

diff --git a/debian/changelog b/debian/changelog
index 99b63c2..2a06aa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+acpica-unix (20200925-2) unstable; urgency=medium
+
+  * ACK for the NMUs: thank you!
+  * Orphaning the package. 
+
+ -- Al Stone <ahs3@debian.org>  Sun, 21 Mar 2021 13:46:41 -0600
+
+acpica-unix (20200925-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Upload to unstable. (Closes: #982495, #982494)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Wed, 17 Feb 2021 09:45:22 +0000
+
+acpica-unix (20200925-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS on mips64el by telling the build system about it.
+    Bug: #982495
+  * Maybe also fix FTBFS on armhf, due to aligned access in
+    AcpiUtReadUint64. Bug: #982494
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Tue, 16 Feb 2021 23:24:40 +0000
+
 acpica-unix (20200925-1) unstable; urgency=medium
 
   * Upgrade to 20200925 upstream 
diff --git a/debian/control b/debian/control
index ca6d1bb..e82573b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: acpica-unix
 Section: devel
 Priority: optional
-Maintainer: Al Stone <ahs3@debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 10~), flex, bison
 Standards-Version: 4.5.0
 Vcs-Git: https://github.com/ahs3/acpica-tools.git
diff --git a/debian/patches/fix_ftbfs_mips64el.patch b/debian/patches/fix_ftbfs_mips64el.patch
new file mode 100644
index 0000000..176a4b2
--- /dev/null
+++ b/debian/patches/fix_ftbfs_mips64el.patch
@@ -0,0 +1,13 @@
+Index: acpica-unix-20200925/source/include/platform/aclinux.h
+===================================================================
+--- acpica-unix-20200925.orig/source/include/platform/aclinux.h
++++ acpica-unix-20200925/source/include/platform/aclinux.h
+@@ -217,7 +217,7 @@
+ 
+ #if defined(__ia64__)    || (defined(__x86_64__) && !defined(__ILP32__)) ||\
+     defined(__aarch64__) || defined(__PPC64__) ||\
+-    defined(__s390x__) ||\
++    defined(__s390x__) || defined(__mips64) ||\
+     (defined(__riscv) && (defined(__LP64__) || defined(_LP64)))
+ #define ACPI_MACHINE_WIDTH          64
+ #define COMPILER_DEPENDENT_INT64    long
diff --git a/debian/patches/series b/debian/patches/series
index 4444c83..99439e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,3 +61,4 @@ facp.patch
 armv7-str-fixes.patch
 dbtest.patch
 ull-32bit.patch
+fix_ftbfs_mips64el.patch