[SCM] beast/master: Acknowledge NMU: 0.7.1-5.2.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b4a5d21cf25e79f807039ef72edae79fb6caa9d8
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 6 15:36:45 2011 +0200

    Acknowledge NMU: 0.7.1-5.2.
    
    Thanks to Stefano Zacchiroli for the good job.

diff --git a/debian/changelog b/debian/changelog
index 673f934..e2a639a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,16 @@ beast (0.7.1-6) UNRELEASED; urgency=low
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 24 Mar 2008 16:22:40 +0000
 
+beast (0.7.1-5.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * new patch 210_volatile.diff: fix cast to volatile pointer.
+    Patch by Jakub Wilk. (Closes: #540681)
+  * new patch 212_gcc44.diff: add missing #include-s for gcc 4.4
+    (Closes: #560499)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 26 Dec 2009 21:33:36 +0100
+
 beast (0.7.1-5.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/210_volatile.diff b/debian/patches/210_volatile.diff
new file mode 100644
index 0000000..9a84d1a
--- /dev/null
+++ b/debian/patches/210_volatile.diff
@@ -0,0 +1,17 @@
+Description: Correct signature for the g_atomic_pointer_get() function.
+Author: Jakub Wilk <ubanus at users.sf.net>
+Bug-Debian: http://bugs.debian.org/540681
+
+Index: beast-0.7.1/birnet/birnetthreadimpl.cc
+===================================================================
+--- beast-0.7.1.orig/birnet/birnetthreadimpl.cc	2009-12-16 20:21:24.000000000 +0100
++++ beast-0.7.1/birnet/birnetthreadimpl.cc	2009-12-16 20:26:16.000000000 +0100
+@@ -1491,7 +1491,7 @@
+ 
+ #ifdef g_atomic_pointer_get
+ static void*
+-(g_atomic_pointer_get) (volatile void **atomic)
++(g_atomic_pointer_get) (void * volatile *atomic)
+ {
+   return (void*) g_atomic_pointer_get (atomic);
+ }
diff --git a/debian/patches/212_gcc44.diff b/debian/patches/212_gcc44.diff
new file mode 100644
index 0000000..b8f9063
--- /dev/null
+++ b/debian/patches/212_gcc44.diff
@@ -0,0 +1,132 @@
+Index: birnet/birnetmsg.cc
+===================================================================
+--- birnet/birnetmsg.cc.orig
++++ birnet/birnetmsg.cc
+@@ -22,6 +22,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <cstring>
++#include <cstdio>
+ 
+ #ifndef _ // FIXME
+ #define _(x)    (x)
+Index: birnet/birnetutils.hh
+===================================================================
+--- birnet/birnetutils.hh.orig
++++ birnet/birnetutils.hh
+@@ -23,6 +23,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <cstdarg>
+ 
+ namespace Birnet {
+ 
+Index: birnet/birnetutils.cc
+===================================================================
+--- birnet/birnetutils.cc.orig
++++ birnet/birnetutils.cc
+@@ -32,6 +32,7 @@
+ #include <cxxabi.h>
+ #include <signal.h>
+ #include <cstring>
++#include <cstdio>
+ 
+ #ifndef _
+ #define _(s)    s
+Index: birnet/tests/strings.cc
+===================================================================
+--- birnet/tests/strings.cc.orig
++++ birnet/tests/strings.cc
+@@ -19,6 +19,7 @@
+ //#define TEST_VERBOSE
+ #include <birnet/birnettests.h>
+ #include <cstdlib>
++#include <cstdio>
+ using namespace Birnet;
+ 
+ namespace {
+Index: bse/bseresamplerimpl.hh
+===================================================================
+--- bse/bseresamplerimpl.hh.orig
++++ bse/bseresamplerimpl.hh
+@@ -25,6 +25,7 @@
+ #include <math.h>
+ #include <cstring>
+ #include <cstdlib>
++#include <cstdio>
+ #ifdef __SSE__
+ #include <xmmintrin.h>
+ #endif
+Index: bse/tests/filtertest.cc
+===================================================================
+--- bse/tests/filtertest.cc.orig
++++ bse/tests/filtertest.cc
+@@ -27,6 +27,7 @@
+ #include <math.h>
+ #include <complex>
+ #include <cstdlib>
++#include <cstdio>
+ 
+ typedef std::complex<double> Complex;
+ using namespace Birnet;
+Index: tests/bse/filtertest.cc
+===================================================================
+--- tests/bse/filtertest.cc.orig
++++ tests/bse/filtertest.cc
+@@ -29,6 +29,7 @@
+ #include "topconfig.h"
+ #include <errno.h>
+ #include <cstdlib>
++#include <cstdio>
+ 
+ using std::string;
+ using std::vector;
+Index: tools/bwtwave.cc
+===================================================================
+--- tools/bwtwave.cc.orig
++++ tools/bwtwave.cc
+@@ -28,6 +28,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <map>
++#include <cstdio>
+ 
+ 
+ namespace BseWaveTool {
+Index: tests/perftest.cc
+===================================================================
+--- tests/perftest.cc.orig
++++ tests/perftest.cc
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <time.h>
++#include <cstdio>
+ 
+ static SfiGlueContext *bse_context = NULL;
+ 
+Index: tests/bse/cxxbinding.cc
+===================================================================
+--- tests/bse/cxxbinding.cc.orig
++++ tests/bse/cxxbinding.cc
+@@ -19,6 +19,7 @@
+ #include "bsecxxapi.hh"
+ #include <bse/bse.h>
+ #include <unistd.h>
++#include <cstdio>
+ 
+ static SfiGlueContext *bse_context = NULL;
+ 
+Index: tests/latency/bselatencytest.cc
+===================================================================
+--- tests/latency/bselatencytest.cc.orig
++++ tests/latency/bselatencytest.cc
+@@ -20,6 +20,7 @@
+ #include <sys/time.h>
+ #include <string>
+ #include <errno.h>
++#include <cstdio>
+ 
+ using namespace std;
+ using namespace Sfi;
diff --git a/debian/patches/series b/debian/patches/series
index 1a665bc..50e412d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,7 @@
 200_signal_h.diff
 201_sparc_alignment.diff
 202_gcc43.diff
+210_volatile.diff
+212_gcc44.diff -p0
 400_desktop_file.diff
 300_mksignals_bashism.diff

-- 
beast packaging