[SCM] hydrogen/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ae26ef790bba396f6abdea789ed79e34e7804237
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jul 1 09:28:38 2011 +0200

    Refresh patches.

diff --git a/debian/patches/09_portaudio_v2.patch b/debian/patches/09_portaudio_v2.patch
index f0fa319..4e64bdd 100644
--- a/debian/patches/09_portaudio_v2.patch
+++ b/debian/patches/09_portaudio_v2.patch
@@ -1,5 +1,10 @@
---- a/libs/hydrogen/src/IO/PortAudioDriver.h
-+++ b/libs/hydrogen/src/IO/PortAudioDriver.h
+---
+ libs/hydrogen/src/IO/PortAudioDriver.h    |    5 +++++
+ libs/hydrogen/src/IO/portaudio_driver.cpp |   20 ++++++++++++++------
+ 2 files changed, 19 insertions(+), 6 deletions(-)
+
+--- hydrogen.orig/libs/hydrogen/src/IO/PortAudioDriver.h
++++ hydrogen/libs/hydrogen/src/IO/PortAudioDriver.h
 @@ -28,6 +28,11 @@
  
  #ifdef PORTAUDIO_SUPPORT
@@ -12,9 +17,9 @@
  #include <inttypes.h>
  #include <portaudio.h>
  
---- a/libs/hydrogen/src/IO/portaudio_driver.cpp
-+++ b/libs/hydrogen/src/IO/portaudio_driver.cpp
-@@ -10,10 +10,11 @@
+--- hydrogen.orig/libs/hydrogen/src/IO/portaudio_driver.cpp
++++ hydrogen/libs/hydrogen/src/IO/portaudio_driver.cpp
+@@ -10,10 +10,11 @@ namespace H2Core
  {
  
  int portAudioCallback(
@@ -28,7 +33,7 @@
      void *userData
  )
  {
-@@ -66,9 +67,16 @@
+@@ -66,9 +67,16 @@ int PortAudioDriver::connect()
  	m_pOut_L = new float[ m_nBufferSize ];
  	m_pOut_R = new float[ m_nBufferSize ];
  
@@ -47,7 +52,7 @@
  	if ( err != paNoError ) {
  		ERRORLOG( "Portaudio error in Pa_Initialize: " + QString( Pa_GetErrorText( err ) ) );
  		return 1;
-@@ -81,9 +89,9 @@
+@@ -81,9 +89,9 @@ int PortAudioDriver::connect()
  	          paFloat32,      /* 32 bit floating point output */
  	          m_nSampleRate,          // sample rate
  	          m_nBufferSize,            // frames per buffer
diff --git a/debian/patches/1001_rubberband_path.patch b/debian/patches/1001_rubberband_path.patch
index 5c4421b..d9c05ff 100644
--- a/debian/patches/1001_rubberband_path.patch
+++ b/debian/patches/1001_rubberband_path.patch
@@ -1,8 +1,12 @@
 Description: Set patch to rubberband CLI
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2011-03-17
---- a/data/hydrogen.default.conf
-+++ b/data/hydrogen.default.conf
+---
+ data/hydrogen.default.conf |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- hydrogen.orig/data/hydrogen.default.conf
++++ hydrogen/data/hydrogen.default.conf
 @@ -18,7 +18,7 @@
  	<hearNewNotes>true</hearNewNotes>
  	<recordEvents>false</recordEvents>
diff --git a/debian/patches/1002_relax_SCons_linux2_resolving.patch b/debian/patches/1002_relax_SCons_linux2_resolving.patch
index d99300a..3822469 100644
--- a/debian/patches/1002_relax_SCons_linux2_resolving.patch
+++ b/debian/patches/1002_relax_SCons_linux2_resolving.patch
@@ -3,9 +3,13 @@ Description: relax SCons linux2 resolving
  resolve as a linux2 architecture.  Fixed by cutting at 6th character.
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2011-03-17
---- a/Sconstruct
-+++ b/Sconstruct
-@@ -47,7 +47,7 @@
+---
+ Sconstruct |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- hydrogen.orig/Sconstruct
++++ hydrogen/Sconstruct
+@@ -47,7 +47,7 @@ def get_platform_flags( opts ):
  
  	env = Environment( options = opts )
  
@@ -14,7 +18,7 @@ Last-Update: 2011-03-17
  		if str(env['debug']) == "1":
  			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
  			for flag in env["optflags"].split(" "):
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ def get_platform_flags( opts ):
  		includes.append( '/opt/local/include' )
  		includes.append( '/usr/local/include/jack' )
  
diff --git a/debian/patches/1003_gcc45.patch b/debian/patches/1003_gcc45.patch
index 36f9214..a727959 100644
--- a/debian/patches/1003_gcc45.patch
+++ b/debian/patches/1003_gcc45.patch
@@ -1,9 +1,13 @@
 Description: Add linkage required with GCC 4.5
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2011-03-17
---- a/Sconstruct
-+++ b/Sconstruct
-@@ -94,6 +94,7 @@
+---
+ Sconstruct |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- hydrogen.orig/Sconstruct
++++ hydrogen/Sconstruct
+@@ -94,6 +94,7 @@ def get_platform_flags( opts ):
  	elif sys.platform[:6] == 'linux2':
  		ldflags.append('-lpthread')
  		ldflags.append('-lasound')

-- 
hydrogen packaging