[SCM] hydrogen packaging branch, master, updated. debian/0.9.4-2-24-g5379f57

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 33fcbd61b9bd82580d8ebb814cbcda70384b473a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 20 17:05:11 2010 +0100

    Refresh patches with shortening options -pab --no-timestamps --no-index.

diff --git a/debian/patches/0001_relax_SCons_linux2_resolving.patch b/debian/patches/0001_relax_SCons_linux2_resolving.patch
index ba38003..0f212ac 100644
--- a/debian/patches/0001_relax_SCons_linux2_resolving.patch
+++ b/debian/patches/0001_relax_SCons_linux2_resolving.patch
@@ -4,10 +4,8 @@ Description: relax SCons linux2 resolving
  6th character.
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2010-03-02
-Index: hydrogen/Sconstruct
-===================================================================
---- hydrogen.orig/Sconstruct
-+++ hydrogen/Sconstruct
+--- a/Sconstruct
++++ b/Sconstruct
 @@ -47,7 +47,7 @@
  
  	env = Environment( options = opts )
diff --git a/debian/patches/09_portaudio_v2.patch b/debian/patches/09_portaudio_v2.patch
index f331bc5..f0fa319 100644
--- a/debian/patches/09_portaudio_v2.patch
+++ b/debian/patches/09_portaudio_v2.patch
@@ -1,7 +1,5 @@
-Index: hydrogen/libs/hydrogen/src/IO/PortAudioDriver.h
-===================================================================
---- hydrogen.orig/libs/hydrogen/src/IO/PortAudioDriver.h	2010-02-13 06:16:54.000000000 +0100
-+++ hydrogen/libs/hydrogen/src/IO/PortAudioDriver.h	2010-02-13 06:17:37.000000000 +0100
+--- a/libs/hydrogen/src/IO/PortAudioDriver.h
++++ b/libs/hydrogen/src/IO/PortAudioDriver.h
 @@ -28,6 +28,11 @@
  
  #ifdef PORTAUDIO_SUPPORT
@@ -14,10 +12,8 @@ Index: hydrogen/libs/hydrogen/src/IO/PortAudioDriver.h
  #include <inttypes.h>
  #include <portaudio.h>
  
-Index: hydrogen/libs/hydrogen/src/IO/portaudio_driver.cpp
-===================================================================
---- hydrogen.orig/libs/hydrogen/src/IO/portaudio_driver.cpp	2010-02-13 06:16:54.000000000 +0100
-+++ hydrogen/libs/hydrogen/src/IO/portaudio_driver.cpp	2010-02-13 06:17:37.000000000 +0100
+--- a/libs/hydrogen/src/IO/portaudio_driver.cpp
++++ b/libs/hydrogen/src/IO/portaudio_driver.cpp
 @@ -10,10 +10,11 @@
  {
  
diff --git a/debian/patches/1001_use_system_tinyxml.patch b/debian/patches/1001_use_system_tinyxml.patch
index ecaf294..d2eca36 100644
--- a/debian/patches/1001_use_system_tinyxml.patch
+++ b/debian/patches/1001_use_system_tinyxml.patch
@@ -1,10 +1,8 @@
 Description: Use system-installed TinyXml
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2010-03-20
-Index: hydrogen/Sconstruct
-===================================================================
---- hydrogen.orig/Sconstruct
-+++ hydrogen/Sconstruct
+--- a/Sconstruct
++++ b/Sconstruct
 @@ -268,6 +268,7 @@
  		env.Append( LIBS = [ "porttime" ] )
  	if str(env['lash']) == "1":
@@ -13,10 +11,8 @@ Index: hydrogen/Sconstruct
  
  	if sys.platform == "darwin":
  		env.Append( LIBS = ["z"] )
-Index: hydrogen/libs/hydrogen/src/local_file_mgr.cpp
-===================================================================
---- hydrogen.orig/libs/hydrogen/src/local_file_mgr.cpp
-+++ hydrogen/libs/hydrogen/src/local_file_mgr.cpp
+--- a/libs/hydrogen/src/local_file_mgr.cpp
++++ b/libs/hydrogen/src/local_file_mgr.cpp
 @@ -48,7 +48,7 @@
  #include <QVector>
  #include <QLocale>
@@ -26,10 +22,8 @@ Index: hydrogen/libs/hydrogen/src/local_file_mgr.cpp
  
  #include <algorithm>
  //#include <cstdio>
-Index: hydrogen/libs/hydrogen/src/preferences.cpp
-===================================================================
---- hydrogen.orig/libs/hydrogen/src/preferences.cpp
-+++ hydrogen/libs/hydrogen/src/preferences.cpp
+--- a/libs/hydrogen/src/preferences.cpp
++++ b/libs/hydrogen/src/preferences.cpp
 @@ -42,7 +42,7 @@
  #include "config.h"
  #include "version.h"
@@ -39,10 +33,8 @@ Index: hydrogen/libs/hydrogen/src/preferences.cpp
  #include <QDir>
  #include <QApplication>
  
-Index: hydrogen/libs/hydrogen/src/song.cpp
-===================================================================
---- hydrogen.orig/libs/hydrogen/src/song.cpp
-+++ hydrogen/libs/hydrogen/src/song.cpp
+--- a/libs/hydrogen/src/song.cpp
++++ b/libs/hydrogen/src/song.cpp
 @@ -25,7 +25,7 @@
  
  #include <cassert>
diff --git a/debian/patches/10_portmidi_v2.patch b/debian/patches/10_portmidi_v2.patch
index 21f2e42..e6e6135 100644
--- a/debian/patches/10_portmidi_v2.patch
+++ b/debian/patches/10_portmidi_v2.patch
@@ -1,7 +1,5 @@
-Index: hydrogen/libs/hydrogen/src/IO/portmidi_driver.cpp
-===================================================================
---- hydrogen.orig/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-02-13 06:16:54.000000000 +0100
-+++ hydrogen/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-02-13 06:17:46.000000000 +0100
+--- a/libs/hydrogen/src/IO/portmidi_driver.cpp
++++ b/libs/hydrogen/src/IO/portmidi_driver.cpp
 @@ -31,7 +31,7 @@
  #ifdef PORTMIDI_SUPPORT
  

-- 
hydrogen packaging