[SCM] supercollider/master: Do not use system yaml-cpp. Closes: #733277

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4614396205a1cf46ba6ca22254eb7076b137f976
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jan 3 12:08:06 2014 -0300

    Do not use system yaml-cpp. Closes: #733277
    
    This reverts commit 5f4d0fb4ce4b15fac4c78bbc871f94ba9fbd9fb8.
    
    Conflicts:
    	debian/rules

diff --git a/debian/control b/debian/control
index e8532f4..f90d682 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ 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 ba8fc5e..eecdbac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,6 @@ 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>
@@ -186,6 +185,10 @@ 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 f76ebbb..cb21598 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ else
 	endif
 endif
 
-DEB_CMAKE_EXTRA_FLAGS = -DDSO_VISIBILITY=on -DSC_EL_BYTECOMPILE=off -DSYSTEM_BOOST=on -DENABLE_TESTSUITE=off -DLIBSCSYNTH=on -DSYSTEM_YAMLCPP=on -DSUPERNOVA="$(DEB_BUILD_SUPERNOVA)"
+DEB_CMAKE_EXTRA_FLAGS = -DDSO_VISIBILITY=on -DSC_EL_BYTECOMPILE=off -DSYSTEM_BOOST=on -DENABLE_TESTSUITE=off -DLIBSCSYNTH=on -DSYSTEM_YAMLCPP=off -DSUPERNOVA="$(DEB_BUILD_SUPERNOVA)"
 
 # Exclude external libs from the source package if unused on linux or using system-supplied
 DEB_UPSTREAM_REPACKAGE_EXCLUDES = \
@@ -41,7 +41,6 @@ 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