[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-7-2-g2a0d6b2

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Wed May 5 12:54:03 UTC 2010


The following commit has been merged in the master branch:
commit 41f74f322b7fde694c50b00bbc6459b2736a6cda
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed May 5 14:45:48 2010 +0200

    Fix endif placement in ia/alpha patch.

diff --git a/debian/patches/alpha_ia64-sigsegv b/debian/patches/alpha_ia64-sigsegv
index 5dec6ee..3e5dec8 100644
--- a/debian/patches/alpha_ia64-sigsegv
+++ b/debian/patches/alpha_ia64-sigsegv
@@ -1,7 +1,7 @@
 Index: jack-audio-connection-kit/dbus/sigsegv.c
 ===================================================================
---- jack-audio-connection-kit.orig/dbus/sigsegv.c	2010-05-04 12:13:51.000000000 +0200
-+++ jack-audio-connection-kit/dbus/sigsegv.c	2010-05-04 12:23:38.000000000 +0200
+--- jack-audio-connection-kit.orig/dbus/sigsegv.c	2010-05-05 14:44:58.000000000 +0200
++++ jack-audio-connection-kit/dbus/sigsegv.c	2010-05-05 14:45:29.000000000 +0200
 @@ -98,6 +98,7 @@
      jack_error("info.si_errno = %d", info->si_errno);
      jack_error("info.si_code  = %d (%s)", info->si_code, si_codes[info->si_code]);
@@ -10,11 +10,11 @@ Index: jack-audio-connection-kit/dbus/sigsegv.c
      for(i = 0; i < NGREG; i++)
          jack_error("reg[%02d]       = 0x" REGFORMAT, i, 
  #if defined(__powerpc__)
-@@ -105,6 +106,7 @@
- #else
+@@ -106,6 +107,7 @@
                  ucontext->uc_mcontext.gregs[i]
  #endif
-+#endif /* alpha, ia64 */
                  );
++#endif /* alpha, ia64 */
  
  #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
+ # if defined(SIGSEGV_STACK_IA64)

-- 
Debian packaging for jack-audio-connection-kit



More information about the pkg-multimedia-commits mailing list