[SCM] composite/master: removed patches applied upstream

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 42cb8fc4a2a7b618f044aa97139a6f0daf482a6f
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Jul 15 23:57:43 2011 +0200

    removed patches applied upstream

diff --git a/debian/patches/02-qstring_int_error.patch b/debian/patches/02-qstring_int_error.patch
deleted file mode 100644
index 347899f..0000000
--- a/debian/patches/02-qstring_int_error.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/10-binutils_gold.patch b/debian/patches/10-binutils_gold.patch
deleted file mode 100644
index 5ea7490..0000000
--- a/debian/patches/10-binutils_gold.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Gabriel M. Beddingfield <gabrbedd at gmail.com>
-Description: Fix FTBFS with binutils-gold.
-Bug-Ubuntu: https://launchpad.net/bugs/685465
-Reviewed-by: Alessio Treglia <alessio at debian.org>
----
- src/Tritium/test/CMakeLists.txt |    1 +
- 1 file changed, 1 insertion(+)
-
---- composite.orig/src/Tritium/test/CMakeLists.txt
-+++ composite/src/Tritium/test/CMakeLists.txt
-@@ -59,6 +59,7 @@ IF(Boost_UNIT_TEST_FRAMEWORK_FOUND)
-       Tritium
-       test_utils_Tritium
-       ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}
-+      ${QT_LIBRARIES}
-       )
- 
-     ADD_TEST(${T} ${T})
diff --git a/debian/patches/series b/debian/patches/series
index c82b2fe..85166ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 01-spelling_errors.patch
-02-qstring_int_error.patch
-10-binutils_gold.patch

-- 
composite packaging