[SCM] beast/master: Incorporate patches for GCC4.4 in 202_gcc43.diff, rename the file properly.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f929c6af2620d81495e4beb376e3148a2eabbfd0
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 6 17:46:04 2011 +0200

    Incorporate patches for GCC4.4 in 202_gcc43.diff, rename the file properly.

diff --git a/debian/patches/202_gcc43.diff b/debian/patches/202_gcc43_44.diff
similarity index 69%
rename from debian/patches/202_gcc43.diff
rename to debian/patches/202_gcc43_44.diff
index a8a8458..e832241 100644
--- a/debian/patches/202_gcc43.diff
+++ b/debian/patches/202_gcc43_44.diff
@@ -1,26 +1,31 @@
 ---
- birnet/birnetmsg.cc         |    2 ++
- birnet/birnetutils.cc       |    2 ++
- birnet/tests/sorting.cc     |    1 +
- birnet/tests/strings.cc     |    2 ++
- birnet/tests/threads.cc     |    1 +
- bse/bsecxxplugin.hh         |    8 ++++++++
- bse/bseloader-guspatch.cc   |    1 +
- bse/bseprocidl.cc           |    1 +
- bse/bseresamplerimpl.hh     |    3 +++
- bse/bsesequencer.cc         |    1 +
- bse/tests/filtertest.cc     |    1 +
- bse/tests/firhandle.cc      |    1 +
- bse/tests/resamplehandle.cc |    1 +
- sfi/sficxx.hh               |    1 +
- sfi/sfidl-cxxbase.cc        |    1 +
- sfi/sfidl-options.cc        |    2 ++
- sfi/sfidl-parser.cc         |    3 +++
- tests/bse/filtertest.cc     |    2 ++
- tools/bsefcompare.cc        |    2 ++
- tools/bsefextract.cc        |    2 ++
- tools/bsewavetool.cc        |    2 ++
- 21 files changed, 40 insertions(+)
+ birnet/birnetmsg.cc             |    2 ++
+ birnet/birnetutils.cc           |    2 ++
+ birnet/birnetutils.hh           |    1 +
+ birnet/tests/sorting.cc         |    1 +
+ birnet/tests/strings.cc         |    2 ++
+ birnet/tests/threads.cc         |    1 +
+ bse/bsecxxplugin.hh             |    8 ++++++++
+ bse/bseloader-guspatch.cc       |    1 +
+ bse/bseprocidl.cc               |    1 +
+ bse/bseresamplerimpl.hh         |    3 +++
+ bse/bsesequencer.cc             |    1 +
+ bse/tests/filtertest.cc         |    2 ++
+ bse/tests/firhandle.cc          |    1 +
+ bse/tests/resamplehandle.cc     |    1 +
+ sfi/sficxx.hh                   |    1 +
+ sfi/sfidl-cxxbase.cc            |    1 +
+ sfi/sfidl-options.cc            |    2 ++
+ sfi/sfidl-parser.cc             |    3 +++
+ tests/bse/cxxbinding.cc         |    1 +
+ tests/bse/filtertest.cc         |    2 ++
+ tests/latency/bselatencytest.cc |    1 +
+ tests/perftest.cc               |    2 ++
+ tools/bsefcompare.cc            |    2 ++
+ tools/bsefextract.cc            |    2 ++
+ tools/bsewavetool.cc            |    2 ++
+ tools/bwtwave.cc                |    3 ++-
+ 26 files changed, 48 insertions(+), 1 deletion(-)
 
 --- beast.orig/bse/tests/firhandle.cc
 +++ beast/bse/tests/firhandle.cc
@@ -34,11 +39,12 @@
  using std::min;
 --- beast.orig/bse/tests/filtertest.cc
 +++ beast/bse/tests/filtertest.cc
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,8 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <complex>
 +#include <cstdlib>
++#include <cstdio>
  
  typedef std::complex<double> Complex;
  using namespace Birnet;
@@ -251,3 +257,56 @@
  #include <sys/time.h>
  #include <sys/types.h>
  #include <sys/stat.h>
+--- beast.orig/birnet/birnetutils.hh
++++ beast/birnet/birnetutils.hh
+@@ -23,6 +23,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <cstdarg>
+ #include <stdarg.h>
+ 
+ namespace Birnet {
+--- beast.orig/tests/bse/cxxbinding.cc
++++ beast/tests/bse/cxxbinding.cc
+@@ -18,6 +18,7 @@
+ #include <bse/bse.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <cstdio>
+ 
+ static SfiGlueContext *bse_context = NULL;
+ 
+--- beast.orig/tests/latency/bselatencytest.cc
++++ beast/tests/latency/bselatencytest.cc
+@@ -19,6 +19,7 @@
+ #include <string>
+ #include <errno.h>
+ #include <stdio.h>
++#include <cstdio>
+ 
+ using namespace std;
+ using namespace Sfi;
+--- beast.orig/tests/perftest.cc
++++ beast/tests/perftest.cc
+@@ -20,6 +20,8 @@
+ #include <sys/time.h>
+ #include <time.h>
+ #include <stdio.h>
++#include <cstdio>
++#include <ctime>
+ 
+ static SfiGlueContext *bse_context = NULL;
+ 
+--- beast.orig/tools/bwtwave.cc
++++ beast/tools/bwtwave.cc
+@@ -27,7 +27,8 @@
+ #include <algorithm>
+ #include <vector>
+ #include <map>
+-
++#include <cerrno>
++#include <cstdio>
+ 
+ namespace BseWaveTool {
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b847c30..fab35f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 100_deprecated.diff 
-202_gcc43.diff
+202_gcc43_44.diff
 210_volatile.diff
-212_gcc44.diff -p0

-- 
beast packaging