[SCM] supercollider/master: exclude icu, simplejson, curl from repacked source

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

The following commit has been merged in the master branch:
commit 8dbc74e0f84113931bf99de3565326d1c39c1cb7
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sun Jun 24 18:26:21 2012 +0100

    exclude icu, simplejson, curl from repacked source

diff --git a/debian/copyright b/debian/copyright
index 506831c..a5494ac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,9 @@ Source: http://supercollider.sourceforge.net/
  Repackaged, excluding third-party Boost library source
 Files-Excluded:
  external_libraries/boost/
+ external_libraries/curl/
+ external_libraries/icu/
+ external_libraries/simplejson-*/
 
 Files: *
 Copyright: 2002-2007, James McCartney <asynth at gmail.com>
@@ -115,50 +118,6 @@ Files: external_libraries/boost_lockfree/boost/memory_order.hpp
 Copyright: 2008, 2009 Peter Dimov
 License: BSL-1.0
 
-Files: external_libraries/curl/*
-Copyright: 1996 - 2009, Daniel Stenberg, <daniel at haxx.se>
-License: BSD-like-curl
- Permission to use, copy, modify, and distribute this software for any purpose
- with or without fee is hereby granted, provided that the above copyright
- notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
- NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of a copyright holder shall not
- be used in advertising or otherwise to promote the sale, use or other dealings
- in this Software without prior written authorization of the copyright holder.
-
-Files: external_libraries/icu/*
-Copyright: 1995-2006 International Business Machines Corporation and others 
-License: BSD-like-icu
- Permission is hereby granted, free of charge, to any person obtaining a copy 
- of this software and associated documentation files (the "Software"), to deal 
- in the Software without restriction, including without limitation the rights 
- to use, copy, modify, merge, publish, distribute, and/or sell copies of the 
- Software, and to permit persons to whom the Software is furnished to do so, 
- provided that the above copyright notice(s) and this permission notice appear 
- in all copies of the Software and that both the above copyright notice(s) and 
- this permission notice appear in supporting documentation.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN 
- NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE 
- LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY 
- DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- .
- Except as contained in this notice, the name of a copyright holder shall not 
- be used in advertising or otherwise to promote the sale, use or other dealings 
- in this Software without prior written authorization of the copyright holder. 
-
 Files: external_libraries/nova-simd/*
 Copyright: 2009 Tim Blechmann
 License: GPL-2+
@@ -256,10 +215,6 @@ License: BSD-like-pycxx
     of California, and shall not be used for advertising or product endorsement
     purposes.
 
-Files: external_libraries/simplejson-2.3.2/*
-Copyright: 2006 Bob Ippolito
-License: MIT
-
 Files: external_libraries/threadpool/*
 Copyright: 2005-2007 Philipp Henkel
 License: BSL-1.0
diff --git a/debian/rules b/debian/rules
index c4a456c..61d4f7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,13 @@ DEB_INSTALL_MANPAGES_supercollider-vim     = debian/scvim.1 debian/sclangpipe_ap
 
 DEB_CMAKE_EXTRA_FLAGS = -DDSO_VISIBILITY=on -DSUPERNOVA=on -DSC_EL_BYTECOMPILE=OFF
 
-# Exclude boost from the source package (DFSG copyright/maintenance concerns)
-DEB_UPSTREAM_REPACKAGE_EXCLUDES = external_libraries/boost/
+# Exclude external libs from the source package if unused on linux or using system-supplied
+DEB_UPSTREAM_REPACKAGE_EXCLUDES = \
+				  external_libraries/boost/ \
+				  external_libraries/curl/ \
+				  external_libraries/libsndfile/ \
+				  external_libraries/simplejson-*/ \
+				  external_libraries/icu
 DEB_UPSTREAM_URL = http://prdownloads.sourceforge.net/supercollider
 DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/supercollider(.*)/SuperCollider$$1-Source-linux/
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2

-- 
supercollider packaging