[SCM] hydrogen/master: debian/patches/1003_ambiguous_qstring_constructor.patch: Fix FTBFS with Qt 4.7 in experimental due to an ambiguous overloaded QString object constructor; thanks to David Sugar for the patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b63abb35e56a9e935a7bd451279407eeb770f481
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Sep 15 12:52:30 2010 +0200

    debian/patches/1003_ambiguous_qstring_constructor.patch: Fix FTBFS with Qt 4.7 in experimental due to an ambiguous overloaded QString object constructor; thanks to David Sugar for the patch.

diff --git a/debian/patches/1003_ambiguous_qstring_constructor.patch b/debian/patches/1003_ambiguous_qstring_constructor.patch
new file mode 100644
index 0000000..6a0ec04
--- /dev/null
+++ b/debian/patches/1003_ambiguous_qstring_constructor.patch
@@ -0,0 +1,22 @@
+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-ftbs-with-new-qt-4-7
+---
+ 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 a6b03a1..38d1d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 10_portmidi_v2.patch
 #1001_use_system_tinyxml.patch
 1002_relax_SCons_linux2_resolving.patch
+1003_ambiguous_qstring_constructor.patch

-- 
hydrogen packaging