[SCM] supercollider/master: Use system libyaml-cpp0.3 (fixes #722430)

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

The following commit has been merged in the master branch:
commit 5f4d0fb4ce4b15fac4c78bbc871f94ba9fbd9fb8
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Thu Sep 12 19:42:16 2013 +0100

    Use system libyaml-cpp0.3 (fixes #722430)

diff --git a/debian/control b/debian/control
index 1894b8d..dbc1f14 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends: cdbs (>= 0.4.73~),
  libreadline-dev,
  libsndfile1-dev (>= 1.0.16),
  libxt-dev,
+ libyaml-cpp0.3,
  python-all-dev (>= 2.6.6-3~),
  qt4-dev-tools,
  libboost-dev (>= 1.50),
diff --git a/debian/copyright b/debian/copyright
index eecdbac..ba8fc5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,7 @@ Files-Excluded:
  external_libraries/curl/
  external_libraries/icu/
  external_libraries/simplejson-*/
+ external_libraries/yaml-cpp-0.3.0/
 
 Files: *
 Copyright: 2002-2007, James McCartney <asynth at gmail.com>
@@ -185,10 +186,6 @@ License: GPL-2+ with TLSF exception or LGPL-2.1+
  however invalidate any other reasons why the executable file might be covered
  by the GNU Public License.
 
-Files: external_libraries/yaml-cpp-0.3.0/*
-Copyright: 2008 Jesse Beder
-License: MIT
-
 Files: lang/LangSource/Bison/lang11d_tab.cpp
 Copyright: 1984, 1989-1990, 2000-2006, Free Software Foundation, Inc.
 License: GPL-2+ with Bison exception
diff --git a/debian/rules b/debian/rules
index 0890e24..9fc26f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DEB_INSTALL_MANPAGES_supercollider-language  = debian/sclang.1
 DEB_INSTALL_MANPAGES_supercollider-vim     = debian/scvim.1 debian/sclangpipe_app.1
 DEB_INSTALL_MANPAGES_supercollider-ide     = debian/scide.1
 
-DEB_CMAKE_EXTRA_FLAGS = -DDSO_VISIBILITY=on -DSUPERNOVA=on -DSC_EL_BYTECOMPILE=off -DSYSTEM_BOOST=on -DENABLE_TESTSUITE=off -DLIBSCSYNTH=on
+DEB_CMAKE_EXTRA_FLAGS = -DDSO_VISIBILITY=on -DSUPERNOVA=on -DSC_EL_BYTECOMPILE=off -DSYSTEM_BOOST=on -DENABLE_TESTSUITE=off -DLIBSCSYNTH=on -DSYSTEM_YAMLCPP=on
 
 # Exclude external libs from the source package if unused on linux or using system-supplied
 DEB_UPSTREAM_REPACKAGE_EXCLUDES = \
@@ -30,6 +30,7 @@ DEB_UPSTREAM_REPACKAGE_EXCLUDES = \
 				  external_libraries/libsndfile/ \
 				  external_libraries/sndfile.hh \
 				  external_libraries/simplejson-*/ \
+				  external_libraries/yaml-cpp-0.3.0 \
 				  external_libraries/icu
 DEB_UPSTREAM_URL = http://prdownloads.sourceforge.net/supercollider
 DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/supercollider(.*)/SuperCollider$$1-Source-linux/

-- 
supercollider packaging