[SCM] a2jmidid/master: Import Debian patch 8~dfsg0-2.1

[mattia at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6c0d999df0350bd28100d8e1b90a25596e93a85d
Author: Fernando Seiti Furusato <ferseiti at linux.vnet.ibm.com>
Date:   Mon Dec 5 11:51:07 2016 -0200

    Import Debian patch 8~dfsg0-2.1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b408e6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.pc
diff --git a/debian/changelog b/debian/changelog
index cefa62b..99de44e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+a2jmidid (8~dfsg0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches:
+    - ppc64-sigsegv.patch: sigsegv.c: added condition to use ucontext.h
+      for ppc64, which wasn't being covered. (Closes: #769141)
+
+ -- Fernando Seiti Furusato <ferseiti at linux.vnet.ibm.com>  Mon, 05 Dec 2016 11:51:07 -0200
+
 a2jmidid (8~dfsg0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/ppc64-sigsegv.patch b/debian/patches/ppc64-sigsegv.patch
new file mode 100644
index 0000000..2bac551
--- /dev/null
+++ b/debian/patches/ppc64-sigsegv.patch
@@ -0,0 +1,19 @@
+Description: Following the same variable and struct usage within sys header
+ file ucontext.h to cover powerpc 64 bit archs.
+Author: Fernando Seiti Furusato <ferseiti at br.ibm.com>
+
+--- a2jmidid-8~dfsg0.orig/sigsegv.c
++++ a2jmidid-8~dfsg0/sigsegv.c
+@@ -94,8 +94,11 @@ static void signal_segv(int signum, sigi
+ #if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
+     for(i = 0; i < NGREG; i++)
+         a2j_error("reg[%02d]       = 0x" REGFORMAT, i,
+-#if defined(__powerpc__)
++#if defined(__powerpc__) && !defined(__powerpc64__)
+                 ucontext->uc_mcontext.uc_regs[i]
++/* just following the variable type and member logic as the ones used here to cover ppc64*/
++#elif defined(__powerpc64__)
++                ucontext->uc_mcontext.gp_regs[i]
+ #elif defined(__sparc__) && defined(__arch64__)
+                 ucontext->uc_mcontext.mc_gregs[i]
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index 5bd8eb3..d8e5e5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 shebangs.diff
+ppc64-sigsegv.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes

-- 
a2jmidid packaging