[SCM] jackd2 packaging branch, master, updated. debian/1.9.5.dfsg-17-7-g17e6d60

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

The following commit has been merged in the master branch:
commit 57d62aa9c7b5dcf19422d24f24334d97eb264d31
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Jul 30 16:37:33 2010 +0200

    Delete obsolete patches.
    
    These patches have been included upstream.

diff --git a/debian/patches/alpha_ia64-sigsegv b/debian/patches/alpha_ia64-sigsegv
deleted file mode 100644
index ec8af57..0000000
--- a/debian/patches/alpha_ia64-sigsegv
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/dbus/sigsegv.c
-+++ b/dbus/sigsegv.c
-@@ -98,14 +98,18 @@
-     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__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
-     for(i = 0; i < NGREG; i++)
-         jack_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/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index 68fa616..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common/JackClient.cpp
-+++ b/common/JackClient.cpp
-@@ -1012,7 +1012,7 @@
-     if (va->load_name && (strlen(va->load_name) >= JACK_PATH_MAX)) {
-         jack_error("\"%s\" is too long for a shared object name.\n"
-                    "Please use %lu characters or less.",
--                   va->load_name, PATH_MAX);
-+                   va->load_name, JACK_PATH_MAX);
-         int my_status1 = *status | (JackFailure | JackInvalidOption);
-         *status = (jack_status_t)my_status1;
-         return 0;
diff --git a/debian/patches/kfreebsd-fix b/debian/patches/kfreebsd-fix
deleted file mode 100644
index a88ac5e..0000000
--- a/debian/patches/kfreebsd-fix
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: jack-audio-connection-kit/common/jack/systemdeps.h
-===================================================================
---- jack-audio-connection-kit.orig/common/jack/systemdeps.h	2010-05-06 16:06:04.000000000 +0200
-+++ jack-audio-connection-kit/common/jack/systemdeps.h	2010-05-06 16:07:11.000000000 +0200
-@@ -53,7 +53,7 @@
- 
- #endif /* WIN32 */
- 
--#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun)
-+#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) || defined(__unix__)
-     #include <inttypes.h>
-     #include <pthread.h>
-     #include <sys/types.h>
-Index: jack-audio-connection-kit/linux/cycles.h
-===================================================================
---- jack-audio-connection-kit.orig/linux/cycles.h	2010-05-06 16:07:11.000000000 +0200
-+++ jack-audio-connection-kit/linux/cycles.h	2010-05-06 16:07:11.000000000 +0200
-@@ -119,4 +119,17 @@
- 
- #endif
- 
-+#if defined(__FreeBSD_kernel__)
-+
-+#warning No suitable get_cycles() implementation. Returning 0 instead
-+
-+typedef unsigned long long cycles_t;
-+
-+static inline cycles_t get_cycles(void)
-+{
-+    return 0;
-+}
-+
-+#endif
-+
- #endif /* __jack_cycles_h__ */
-Index: jack-audio-connection-kit/wscript
-===================================================================
---- jack-audio-connection-kit.orig/wscript	2010-05-06 16:07:11.000000000 +0200
-+++ jack-audio-connection-kit/wscript	2010-05-06 16:07:32.000000000 +0200
-@@ -78,7 +78,7 @@
- def configure(conf):
-     platform = Utils.detect_platform()
-     conf.env['IS_MACOSX'] = platform == 'darwin'
--    conf.env['IS_LINUX'] = platform == 'linux'
-+    conf.env['IS_LINUX'] = platform == 'linux' or platform == 'posix'
-     conf.env['IS_SUN'] = platform == 'sunos'
- 
-     if conf.env['IS_LINUX']:

-- 
jackd2 packaging