[SCM] a2jmidid/master: Drop armel-sig-reg-fix.diff, already applied.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Jan 12 15:24:00 UTC 2011


The following commit has been merged in the master branch:
commit 1b64468e4eecd2aa6f350a1bcc395a3ee6800a53
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jan 12 16:23:30 2011 +0100

    Drop armel-sig-reg-fix.diff, already applied.

diff --git a/debian/patches/armel-sig-reg-fix.diff b/debian/patches/armel-sig-reg-fix.diff
deleted file mode 100644
index 37dee59..0000000
--- a/debian/patches/armel-sig-reg-fix.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix to allow a2jmidid to compile on all supported platforms
- Backported from jackd2's dbus/sigsegv.c
-Author: Jamie Bennett <jb at canonical.com>, Adrian Knoth <adi at drcomp.erfurt.thur.de>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/556351
-Forwarded: Yes, by Adrian Knoth <adi@@drcomp.erfurt.thur.de>
-
---- a/sigsegv.c
-+++ b/sigsegv.c
-@@ -91,8 +91,18 @@
-     a2j_error("info.si_errno = %d", info->si_errno);
-     a2j_error("info.si_code  = %d (%s)", info->si_code, si_codes[info->si_code]);
-     a2j_error("info.si_addr  = %p", info->si_addr);
-+#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, ucontext->uc_mcontext.gregs[i]);
-+        a2j_error("reg[%02d]       = 0x" REGFORMAT, i,
-+#if defined(__powerpc__)
-+                ucontext->uc_mcontext.uc_regs[i]
-+#elif defined(__sparc__) && defined(__arch64__)
-+                ucontext->uc_mcontext.mc_gregs[i]
-+#else
-+                ucontext->uc_mcontext.gregs[i]
-+#endif
-+                );
-+#endif /* alpha, ia64, kFreeBSD, arm, hppa */
- 
- #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
- # if defined(SIGSEGV_STACK_IA64)
diff --git a/debian/patches/series b/debian/patches/series
index 08f19ac..5bd8eb3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-armel-sig-reg-fix.diff
 shebangs.diff

-- 
a2jmidid packaging



More information about the pkg-multimedia-commits mailing list