[SCM] hydrogen/master: Drop 1003_ambiguous_qstring_constructor.patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 80a2df2e952985ecae20f070390eb6e70d297deb
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 22 19:44:11 2010 +0200

    Drop 1003_ambiguous_qstring_constructor.patch, applied upstream.

diff --git a/debian/patches/1003_ambiguous_qstring_constructor.patch b/debian/patches/1003_ambiguous_qstring_constructor.patch
deleted file mode 100644
index afe10a9..0000000
--- a/debian/patches/1003_ambiguous_qstring_constructor.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Origin: Ubuntu
-Author: David Sugar <david.sugar at canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/601195
-Bug-Debian: http://bugs.debian.org/596956
-Description: Fix FTBFS due to an ambiguous overloaded QString object
- constructor.
-Forwarded: https://www.assembla.com/spaces/hydrogen/tickets/133
-Applied-Upstream: commit:1900
----
- libs/hydrogen/src/song.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- hydrogen.orig/libs/hydrogen/src/song.cpp
-+++ hydrogen/libs/hydrogen/src/song.cpp
-@@ -141,7 +141,7 @@ Song* Song::get_default_song(){
- 		song->set_swing_factor( 0.0 );
- 
- 		InstrumentList* pList = new InstrumentList();
--		Instrument *pNewInstr = new Instrument(QString( 0 ), "New instrument", new ADSR());
-+		Instrument *pNewInstr = new Instrument(QString( "" ), "New instrument", new ADSR());
- 		pList->add( pNewInstr );
- 		song->set_instrument_list( pList );
- 		
diff --git a/debian/patches/series b/debian/patches/series
index 64dab98..91a463d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
 09_portaudio_v2.patch
 #1001_use_system_tinyxml.patch
 1002_relax_SCons_linux2_resolving.patch
-1003_ambiguous_qstring_constructor.patch

-- 
hydrogen packaging