[SCM] hydrogen packaging branch, master, updated. c1ebe0bf09c1ecd0fb25fd8c5c9fb901551f74d4

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a5f1b2c6460fb8952f31f385d39c4c3964e89bb0
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Feb 13 02:09:25 2010 +0100

    Drop patch 06: No longer applying.

diff --git a/debian/patches/06_drumkit_load.patch b/debian/patches/06_drumkit_load.patch
deleted file mode 100644
index d5819f7..0000000
--- a/debian/patches/06_drumkit_load.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix crash with missing drumkit samples
-
-Index: hydrogen/src/lib/Hydrogen.cpp
-===================================================================
---- hydrogen.orig/src/lib/Hydrogen.cpp	2010-02-12 17:12:07.000000000 +0100
-+++ hydrogen/src/lib/Hydrogen.cpp	2010-02-12 17:32:21.000000000 +0100
-@@ -2492,8 +2492,7 @@
- 	//				pSample->setFilename( pNewSample->getFilename() );	// riuso il path del nuovo sample (perche' e' gia relativo al path del drumkit)
- 					if (pSample == NULL) {
- 						errorLog( "[loadDrumkit] Error Loading drumkit: NULL sample, now using /emptySample.wav" );
--						pSample->m_sFilename = string(DataPath::getDataPath() ).append( "/emptySample.wav" );
--						pSample = Sample::load( pSample->m_sFilename );
-+						pSample = Sample::load( string(DataPath::getDataPath() ).append( "/emptySample.wav" ));
- 					}
- 					InstrumentLayer *pLayer = new InstrumentLayer( pSample );
- 					pLayer->m_fStartVelocity = pNewLayer->m_fStartVelocity;
diff --git a/debian/patches/series b/debian/patches/series
index 549cc48..cebf03e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 02_gcc41.patch
 03_gcc43.patch
-06_drumkit_load.patch
 07_gcc44.patch
 08_550303_kbsd.patch

-- 
hydrogen packaging