[SCM] hydrogen packaging branch, master, updated. debian/0.9.4-2-24-g5379f57

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Mar 22 12:06:24 UTC 2010


The following commit has been merged in the master branch:
commit 1094d93b3d816a8a7ae452bd9d853fbefa7cc65c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 21 16:41:10 2010 +0100

    Adjust patch 1001 to use nostl variant of system TinyXML.

diff --git a/debian/patches/1001_use_system_tinyxml.patch b/debian/patches/1001_use_system_tinyxml.patch
index d2eca36..881e175 100644
--- a/debian/patches/1001_use_system_tinyxml.patch
+++ b/debian/patches/1001_use_system_tinyxml.patch
@@ -7,7 +7,7 @@ Last-Update: 2010-03-20
  		env.Append( LIBS = [ "porttime" ] )
  	if str(env['lash']) == "1":
  	        env.ParseConfig('pkg-config --cflags --libs lash-1.0')
-+	env.ParseConfig('pkg-config --cflags --libs tinyxml-stl')
++	env.ParseConfig('pkg-config --cflags --libs tinyxml-nostl')
  
  	if sys.platform == "darwin":
  		env.Append( LIBS = ["z"] )

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list