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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7856e13bd4ad09e1431c1e87a878183c5f554758
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Mar 12 02:14:10 2010 +0100

    Add patch 1001 to use system-installed TinyXml.

diff --git a/debian/patches/1001_use_system_tinyxml.patch b/debian/patches/1001_use_system_tinyxml.patch
new file mode 100644
index 0000000..c365578
--- /dev/null
+++ b/debian/patches/1001_use_system_tinyxml.patch
@@ -0,0 +1,54 @@
+Description: Use system-installed TinyXml
+Author: Jonas Smedegaard <dr at jones.dk>
+Last-Update: 2010-03-12
+Index: hydrogen/Sconstruct
+===================================================================
+--- hydrogen.orig/Sconstruct
++++ hydrogen/Sconstruct
+@@ -268,6 +268,7 @@
+ 		env.Append( LIBS = [ "porttime" ] )
+ 	if str(env['lash']) == "1":
+ 	        env.ParseConfig('pkg-config --cflags --libs lash-1.0')
++	env.Append( LIBS = ["tinyxml"] )
+ 
+ 	if sys.platform == "darwin":
+ 		env.Append( LIBS = ["z"] )
+Index: hydrogen/libs/hydrogen/src/local_file_mgr.cpp
+===================================================================
+--- hydrogen.orig/libs/hydrogen/src/local_file_mgr.cpp
++++ hydrogen/libs/hydrogen/src/local_file_mgr.cpp
+@@ -48,7 +48,7 @@
+ #include <QVector>
+ #include <QLocale>
+ 
+-#include "xml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include <algorithm>
+ //#include <cstdio>
+Index: hydrogen/libs/hydrogen/src/preferences.cpp
+===================================================================
+--- hydrogen.orig/libs/hydrogen/src/preferences.cpp
++++ hydrogen/libs/hydrogen/src/preferences.cpp
+@@ -42,7 +42,7 @@
+ #include "config.h"
+ #include "version.h"
+ 
+-#include "xml/tinyxml.h"
++#include <tinyxml.h>
+ #include <QDir>
+ #include <QApplication>
+ 
+Index: hydrogen/libs/hydrogen/src/song.cpp
+===================================================================
+--- hydrogen.orig/libs/hydrogen/src/song.cpp
++++ hydrogen/libs/hydrogen/src/song.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include <cassert>
+ 
+-#include "xml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include <hydrogen/adsr.h>
+ #include <hydrogen/data_path.h>
diff --git a/debian/patches/series b/debian/patches/series
index 3d174e2..8a506f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 #08_550303_kbsd.patch
 09_portaudio_v2.patch
 10_portmidi_v2.patch
+1001_use_system_tinyxml.patch

-- 
hydrogen packaging