[SCM] jackd2 packaging branch, master, updated. debian/1.9.5.dfsg-19-8-g15107ca

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

The following commit has been merged in the master branch:
commit e584b64c69a2d49856aa81a79a0609241d59a408
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Aug 30 14:26:57 2010 +0200

    Drop obsolete patch.
    
    Included upstream.

diff --git a/debian/patches/sparc-kfreebsd.patch b/debian/patches/sparc-kfreebsd.patch
deleted file mode 100644
index e76dbf7..0000000
--- a/debian/patches/sparc-kfreebsd.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
-Forwarded: http://trac.jackaudio.org/ticket/188
-Description: Fix FTBFS on sparc and kFreeBSD
---- a/linux/cycles.h
-+++ b/linux/cycles.h
-@@ -51,7 +51,7 @@
-     return (((unsigned long)hi)<<32) | ((unsigned long)lo);
- }
- 
--#endif
-+#endif /* __x86_64__ */
- 
- #ifdef __sparc_v9__
- /* rd is V9 only */
-@@ -61,7 +61,7 @@
- 	__asm__ __volatile__("rd %%tick, %0" : "=r"(res));
- 	return res;
- }
--#endif
-+#endif /* __sparc_v9__ */
- 
- #ifdef __PPC__
- 
-@@ -92,7 +92,7 @@
-     return ret;
- }
- 
--#endif
-+#endif /* __PPC__ */
- 
- #ifdef __i386__
- 
-@@ -111,9 +111,10 @@
-     return ret;
- }
- 
--#endif
-+#endif /* __i386__ */
- 
--#if defined(__FreeBSD_kernel__)
-+/* everything else but x86, amd64, sparcv9 or ppc */
-+#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__) && !defined (__sparc_v9__)
- 
- #warning No suitable get_cycles() implementation. Returning 0 instead
- 
-@@ -124,10 +125,12 @@
-     return 0;
- }
- 
--#endif
-+#endif /* everything else but x86, amd64, sparcv9 or ppc */
-+
-+#endif /* __linux__ */
- 
--/* everything else but x86, amd64 or ppc */
--#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
-+
-+#if defined(__FreeBSD_kernel__)
- 
- #warning No suitable get_cycles() implementation. Returning 0 instead
- 
-@@ -138,8 +141,7 @@
-     return 0;
- }
- 
--#endif
-+#endif /* __FreeBSD_kernel__ */
- 
--#endif
- 
- #endif /* __jack_cycles_h__ */

-- 
jackd2 packaging