[SCM] composite packaging branch, master, updated. debian/0.006-3-3-gdb265ff

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit db265fff0551dbcb5aa1333775fdd9c6e49e48fb
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Aug 2 10:38:37 2010 +0200

    Add patch from upstream's git to prevent FTBFS with newer QTs.

diff --git a/debian/patches/02-qstring_int_error.patch b/debian/patches/02-qstring_int_error.patch
new file mode 100644
index 0000000..347899f
--- /dev/null
+++ b/debian/patches/02-qstring_int_error.patch
@@ -0,0 +1,17 @@
+From: Gabriel M. Beddingfield <gabriel at teuton.org>
+Description: Replace using of QString(int) with QString(const char*) to fix
+ FTBFS on Ubuntu Maverick (alpha).
+---
+ src/Tritium/src/Song.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+--- a/src/Tritium/src/Song.cpp
++++ b/src/Tritium/src/Song.cpp
+@@ -439,7 +439,7 @@ namespace Tritium
+ 	song->set_humanize_velocity_value( 0.0 );
+ 	song->set_swing_factor( 0.0 );
+ 
+-	T<Instrument>::shared_ptr inst( new Instrument( QString(0), "New instrument", new ADSR ) );
++	T<Instrument>::shared_ptr inst( new Instrument( QString("0"), "New instrument", new ADSR ) );
+ 	T<Sampler>::shared_ptr sampler = engine->get_sampler();
+ 	sampler->clear();
+ 	sampler->add_instrument( inst );
diff --git a/debian/patches/series b/debian/patches/series
index 85166ca..88129b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-spelling_errors.patch
+02-qstring_int_error.patch

-- 
composite packaging