[SCM] jackd2/master: Unfuzz patches.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sat Oct 16 09:19:57 UTC 2010
The following commit has been merged in the master branch:
commit a3c7b61d182f5c53f3b60bf6dd0e3abd371b3b40
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sat Oct 16 10:56:50 2010 +0200
Unfuzz patches.
diff --git a/debian/patches/1001_connect.patch b/debian/patches/1001_connect.patch
index b99a215..1902e35 100644
--- a/debian/patches/1001_connect.patch
+++ b/debian/patches/1001_connect.patch
@@ -14,7 +14,7 @@ Last-Update: 2010-04-03
#endif
#include <string.h>
#include <stdlib.h>
-@@ -37,6 +38,7 @@
+@@ -44,6 +45,7 @@
{
jack_client_t* client = NULL;
char *my_name = strrchr(argv[0], '/');
@@ -22,7 +22,7 @@ Last-Update: 2010-04-03
connecting = disconnecting = FALSE;
if (my_name == 0) {
my_name = argv[0];
-@@ -56,6 +58,8 @@
+@@ -63,6 +65,8 @@
return 1;
}
@@ -31,7 +31,7 @@ Last-Update: 2010-04-03
if (argc != 3) {
fprintf (stderr, "usage: %s <src_port> <dst_port>\n", my_name);
fprintf(stderr, "The source port must be an output port of the source client.\n");
-@@ -63,9 +67,16 @@
+@@ -70,9 +74,16 @@
return 1;
}
diff --git a/debian/patches/hppa-parallel.patch b/debian/patches/hppa-parallel.patch
index ea5f00d..ecbeae9 100644
--- a/debian/patches/hppa-parallel.patch
+++ b/debian/patches/hppa-parallel.patch
@@ -4,7 +4,7 @@ Origin: http://code.google.com/p/waf/source/browse/tags/waf-1.5.0/playground/ser
--- a/.waf-1.5.0-8e39a4c1c16303c1e8f010bf330305f6/wafadmin/Runner.py
+++ b/.waf-1.5.0-8e39a4c1c16303c1e8f010bf330305f6/wafadmin/Runner.py
-@@ -143,3 +143,100 @@ class Parallel(object):
+@@ -143,3 +143,100 @@
self.consumers=[TaskConsumer(self)for i in xrange(self.numjobs)]
assert(self.count==0 or self.stop)
--
jackd2 packaging
More information about the pkg-multimedia-commits
mailing list