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

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

The following commit has been merged in the master branch:
commit 04aac078fd36d82ff7fd1665597557e6ea1b74e8
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon May 3 22:22:18 2010 +0200

    More varargs fixes for armel.
    
    The last commit wasn't enough, hope this really fixes the issue.

diff --git a/debian/patches/more-varargs b/debian/patches/more-varargs
new file mode 100644
index 0000000..7a01451
--- /dev/null
+++ b/debian/patches/more-varargs
@@ -0,0 +1,34 @@
+Index: jack-audio-connection-kit/common/JackServerAPI.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackServerAPI.cpp	2010-05-03 22:26:49.000000000 +0200
++++ jack-audio-connection-kit/common/JackServerAPI.cpp	2010-05-03 22:28:13.000000000 +0200
+@@ -73,11 +73,7 @@
+     }
+ 
+     /* parse variable arguments */
+-    if (ap) {
+-        jack_varargs_parse(options, ap, &va);
+-    } else {
+-        jack_varargs_init(&va);
+-    }
++    jack_varargs_parse(options, ap, &va);
+ 
+     if (!JackServerGlobals::Init()) { // jack server initialisation
+         int my_status1 = (JackFailure | JackServerError);
+Index: jack-audio-connection-kit/common/JackLibAPI.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackLibAPI.cpp	2010-05-03 22:26:49.000000000 +0200
++++ jack-audio-connection-kit/common/JackLibAPI.cpp	2010-05-03 22:29:04.000000000 +0200
+@@ -77,11 +77,7 @@
+     }
+ 
+     /* parse variable arguments */
+-    if (ap) {
+-        jack_varargs_parse(options, ap, &va);
+-    } else {
+-        jack_varargs_init(&va);
+-    }
++    jack_varargs_parse(options, ap, &va);
+         
+     JackLibGlobals::Init(); // jack library initialisation
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 75ec405..aa69691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 0000_sync_upstream_VCS.patch
 atomic
 armel-varargs
+more-varargs
 get_cycles
 pointersize
 0001_jackrec-rename.patch

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