[SCM] csound/master: Drop patches grabbed from upstream development

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 83bf51942aaf6209d04b5e7ae38bd91de032108e
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Jan 17 21:13:48 2011 -0300

    Drop patches grabbed from upstream development

diff --git a/debian/patches/0000-fix-continuation-segfaults.diff b/debian/patches/0000-fix-continuation-segfaults.diff
deleted file mode 100644
index 9f74972..0000000
--- a/debian/patches/0000-fix-continuation-segfaults.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Fix a segfault when an ending \ is used to split a line in the
- orchestra.
-Origin: upstream, commit:1.114, commit:1.117
---- a/Engine/rdorch.c
-+++ b/Engine/rdorch.c
-@@ -546,14 +546,14 @@
-         else
-           ungetorchar(csound, c2);
-       }
--      if (c == ';' && !heredoc && !openquote) {
-+      if (c == ';' && !heredoc) {
-         skiporchar(csound);
-         *(cp - 1) = (char) (c = '\n');
-       }
-       if (c == '"' && !heredoc) {
-         openquote = !openquote;
-       }
--      if (c == '\\' && !heredoc) {                   /* Continuation ?       */
-+      if (c == '\\' && !heredoc && !openquote) {      /* Continuation ?       */
-         while ((c = getorchar(csound)) == ' ' || c == '\t')
-           ;                                          /* Ignore spaces        */
-         if (c == ';') {                              /* Comments get skipped */
-@@ -563,7 +563,7 @@
-         if (c == '\n') {
-           cp--;                                      /* Ignore newline */
-           srccnt++;                                  /*    record a fakeline */
--          lincnt++;
-+          /* lincnt++; Thsi is wrong */
-         }
-         else {
-           *cp++ = c;
-@@ -583,6 +583,7 @@
-       }
-       else if (c == '\n') {                          /* at each new line */
-         char *lp = ST(linadr)[lincnt];
-+        /* printf("lincnt=%d; lp=%p, ST(linadr)=%p\n", lincnt, lp, ST(linadr)); */
-         while ((c = *lp) == ' ' || c == '\t')
-           lp++;
-         if (*lp != '\n' && *lp != ';') {
-@@ -1138,11 +1139,15 @@
-         grpp = ST(group)[grpcnt++] = cp;
-         *cp++ = c;                          /*  cpy to nxt quote */
-        do {
--          c = *lp++;
--          if (c=='\\') {                    /* Deal with \" case */
--            c = *lp++;
--          }
--          *cp++ = c;
-+       loop:
-+         c = *lp++;
-+         if (c=='\\' && *lp=='"') {        /* Deal with \" case */
-+           *cp++ = '\\';
-+           *cp++ = '"';
-+           lp++;
-+           goto loop;
-+         }
-+         *cp++ = c;
-        } while (c != '"' && c != '\n');
-         if (c == '\n')
-           synterrp(csound, lp - 1, Str("unmatched quotes"));
diff --git a/debian/patches/0001-acquire-lock-before-use.diff b/debian/patches/0001-acquire-lock-before-use.diff
deleted file mode 100644
index 2a2c99e..0000000
--- a/debian/patches/0001-acquire-lock-before-use.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Acquire bus lock at init time
- Otherwise we get segfaults when trying to use it at perf time
-Origin: upstream, commit:1.40
-Bug-Debian: http://bugs.debian.org/603321
---- a/OOps/bus.c
-+++ b/OOps/bus.c
-@@ -1056,6 +1056,8 @@
-     err = csoundGetChannelPtr(csound, &(p->fp), (char*) p->iname,
-                               CSOUND_AUDIO_CHANNEL | CSOUND_OUTPUT_CHANNEL);
-     if (LIKELY(!err)) {
-+      p->lock = csoundGetChannelLock(csound, (char*) p->iname,
-+    	                      CSOUND_AUDIO_CHANNEL | CSOUND_OUTPUT_CHANNEL);
-       p->h.opadr = (SUBR) chnclear_opcode_perf;
-       return OK;
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 46cfd13..2d62d5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-0000-fix-continuation-segfaults.diff
-0001-acquire-lock-before-use.diff
 1000-use-system-stk.diff
 1003-abi-plugin-dir.diff
 2000-avoid-nonfree-scansyn-plugin.diff

-- 
csound packaging