[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-8-4-gd63a437

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 78b29dbf3ca1c05848f69d9f4cfa0ff71883099c
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu May 6 12:26:04 2010 +0200

    Merge more-kfreebsd with ia64-alpha patch.

diff --git a/debian/patches/alpha_ia64-sigsegv b/debian/patches/alpha_ia64-sigsegv
index 3e5dec8..ebf3c49 100644
--- a/debian/patches/alpha_ia64-sigsegv
+++ b/debian/patches/alpha_ia64-sigsegv
@@ -6,7 +6,7 @@ Index: jack-audio-connection-kit/dbus/sigsegv.c
      jack_error("info.si_errno = %d", info->si_errno);
      jack_error("info.si_code  = %d (%s)", info->si_code, si_codes[info->si_code]);
      jack_error("info.si_addr  = %p", info->si_addr);
-+#if !defined(__alpha__) && !defined(__ia64__)
++#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__)
      for(i = 0; i < NGREG; i++)
          jack_error("reg[%02d]       = 0x" REGFORMAT, i, 
  #if defined(__powerpc__)
diff --git a/debian/patches/more-kfreebsd b/debian/patches/more-kfreebsd
deleted file mode 100644
index dfff165..0000000
--- a/debian/patches/more-kfreebsd
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jack-audio-connection-kit-1.9.5~dfsg/dbus/sigsegv.c
-===================================================================
---- jack-audio-connection-kit-1.9.5~dfsg.orig/dbus/sigsegv.c	2010-05-05 18:51:06.000000000 +0200
-+++ jack-audio-connection-kit-1.9.5~dfsg/dbus/sigsegv.c	2010-05-05 18:52:05.000000000 +0200
-@@ -98,7 +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]);
-     jack_error("info.si_addr  = %p", info->si_addr);
--#if !defined(__alpha__) && !defined(__ia64__)
-+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__)
-     for(i = 0; i < NGREG; i++)
-         jack_error("reg[%02d]       = 0x" REGFORMAT, i, 
- #if defined(__powerpc__)
diff --git a/debian/patches/series b/debian/patches/series
index 87690b5..33a4514 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ alpha_ia64-sigsegv
 0002_manpages.patch
 1001_connect.patch
 1002_waf_wscript_update.patch
-more-kfreebsd

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