[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/0.118+svn3796-3-7-gfef1030

Wed Mar 10 17:50:44 UTC 2010

The following commit has been merged in the master branch:
commit fef10303636be73fe0cecdea12e980364d4466fa
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 10 18:50:28 2010 +0100

    Refresh patches (using --no-timestamp to limit future VCS noise.

diff --git a/debian/patches/1001_big_endian_alsa.patch b/debian/patches/1001_big_endian_alsa.patch
index 1767814..a52f485 100644
--- a/debian/patches/1001_big_endian_alsa.patch
+++ b/debian/patches/1001_big_endian_alsa.patch
@@ -2,10 +2,10 @@ This patch is a cure for #486308 and has been sent to upstream.
 
 It can be removed when http://trac.jackaudio.org/ticket/135 is closed.
 
-Index: drivers/alsa/memops.c
+Index: jack-audio-connection-kit/drivers/alsa/memops.c
 ===================================================================
---- a/drivers/alsa/memops.c	(revision 3637)
-+++ b/drivers/alsa/memops.c	(working copy)
+--- jack-audio-connection-kit.orig/drivers/alsa/memops.c
++++ jack-audio-connection-kit/drivers/alsa/memops.c
 @@ -347,7 +347,7 @@
  		x <<= 8;
  		x |= (unsigned char)(src[0]);
diff --git a/debian/patches/1002_warn_deprecated.patch b/debian/patches/1002_warn_deprecated.patch
index 6d0e0e7..f9eb601 100644
--- a/debian/patches/1002_warn_deprecated.patch
+++ b/debian/patches/1002_warn_deprecated.patch
@@ -8,11 +8,11 @@ can be removed when it hits their repository.
 
 See http://bugs.debian.org/548537 for the whole story.
 
-diff --git a/jack/jack.h b/jack/jack.h
-index 3415905..1bcb51a 100644
---- a/jack/jack.h
-+++ b/jack/jack.h
-@@ -81,7 +81,7 @@ jack_client_t *jack_client_open (const char *client_name,
+Index: jack-audio-connection-kit/jack/jack.h
+===================================================================
+--- jack-audio-connection-kit.orig/jack/jack.h
++++ jack-audio-connection-kit/jack/jack.h
+@@ -102,7 +102,7 @@
   *  NEW JACK CLIENTS</b>
   *
   */
@@ -21,7 +21,7 @@ index 3415905..1bcb51a 100644
  
  /**
   * Disconnects an external client from a JACK server.
-@@ -127,14 +127,14 @@ char *jack_get_client_name (jack_client_t *client);
+@@ -148,14 +148,14 @@
   */
  int jack_internal_client_new (const char *client_name,
  			      const char *load_name,
@@ -38,7 +38,7 @@ index 3415905..1bcb51a 100644
  
  /**
   * Tell the Jack server that the program is ready to start processing
-@@ -182,7 +182,7 @@ int jack_is_realtime (jack_client_t *client);
+@@ -203,7 +203,7 @@
   * It should be replace by use of @ jack_cycle_wait and @ jack_cycle_signal functions.
   *
   */
@@ -47,7 +47,7 @@ index 3415905..1bcb51a 100644
  
  /**
   * Wait until this JACK client should process data.
-@@ -442,7 +442,7 @@ jack_nframes_t jack_get_buffer_size (jack_client_t *);
+@@ -490,7 +490,7 @@
   *
   * @return ENOSYS, function not implemented.
   */
@@ -56,7 +56,7 @@ index 3415905..1bcb51a 100644
  
  /**
   * @return the current CPU load estimated by JACK.  This is a running
-@@ -603,7 +603,7 @@ const char **jack_port_get_all_connections (const jack_client_t *client,
+@@ -651,7 +651,7 @@
   * turned out to serve essentially no purpose in real-life
   * JACK clients.
   */
@@ -65,7 +65,7 @@ index 3415905..1bcb51a 100644
  
  /**
   *
-@@ -612,7 +612,7 @@ int  jack_port_tie (jack_port_t *src, jack_port_t *dst);
+@@ -660,7 +660,7 @@
   * turned out to serve essentially no purpose in real-life
   * JACK clients.
   */
@@ -74,11 +74,11 @@ index 3415905..1bcb51a 100644
  
  /** 
   * @return the time (in frames) between data being available or
-diff --git a/jack/transport.h b/jack/transport.h
-index 69e70e2..4794e52 100644
---- a/jack/transport.h
-+++ b/jack/transport.h
-@@ -410,7 +410,7 @@ typedef enum {
+Index: jack-audio-connection-kit/jack/transport.h
+===================================================================
+--- jack-audio-connection-kit.orig/jack/transport.h
++++ jack-audio-connection-kit/jack/transport.h
+@@ -410,7 +410,7 @@
  	JackTransportSMPTE =    0x8,	/**< SMPTE (ignored) */
  	JackTransportBBT =      0x10	/**< Bar, Beat, Tick */
  
@@ -87,7 +87,7 @@ index 69e70e2..4794e52 100644
  
  /**
   * Deprecated struct for transport position information.
-@@ -444,7 +444,7 @@ typedef struct {
+@@ -444,7 +444,7 @@
      double         ticks_per_beat;
      double         beats_per_minute;
  
@@ -96,7 +96,7 @@ index 69e70e2..4794e52 100644
  	
  /**
   * Gets the current transport info structure (deprecated).
-@@ -459,7 +459,7 @@ typedef struct {
+@@ -459,7 +459,7 @@
   * @pre Must be called from the process thread.
   */
  void jack_get_transport_info (jack_client_t *client,
@@ -105,7 +105,7 @@ index 69e70e2..4794e52 100644
  
  /**
   * Set the transport info structure (deprecated).
-@@ -469,7 +469,7 @@ void jack_get_transport_info (jack_client_t *client,
+@@ -469,7 +469,7 @@
   * a ::JackTimebaseCallback.
   */
  void jack_set_transport_info (jack_client_t *client,
@@ -114,13 +114,13 @@ index 69e70e2..4794e52 100644
  
  #ifdef __cplusplus
  }
-diff --git a/jack/types.h b/jack/types.h
-index 020a51b..014e623 100644
---- a/jack/types.h
-+++ b/jack/types.h
-@@ -397,4 +397,10 @@ enum JackStatus {
-  */
- typedef enum JackStatus jack_status_t;
+Index: jack-audio-connection-kit/jack/types.h
+===================================================================
+--- jack-audio-connection-kit.orig/jack/types.h
++++ jack-audio-connection-kit/jack/types.h
+@@ -437,4 +437,10 @@
+ };	    
+ 
  
 +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3 )                   
 +# define JACK_DEPRECATED __attribute__((__deprecated__))                      
diff --git a/debian/patches/2001_debian_lib64.patch b/debian/patches/2001_debian_lib64.patch
index d933d51..0640e98 100644
--- a/debian/patches/2001_debian_lib64.patch
+++ b/debian/patches/2001_debian_lib64.patch
@@ -1,6 +1,8 @@
---- a/configure.ac	2008-03-15 11:46:41.000000000 +0000
-+++ b/configure.ac	2008-03-15 11:47:21.000000000 +0000
-@@ -102,19 +102,8 @@
+Index: jack-audio-connection-kit/configure.ac
+===================================================================
+--- jack-audio-connection-kit.orig/configure.ac
++++ jack-audio-connection-kit/configure.ac
+@@ -171,19 +171,8 @@
  
  #
  # We need to establish suitable defaults for a 64-bit OS

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

