[SCM] supercollider/master: Merge remote-tracking branch 'origin/master'

[fsateler at users.alioth.debian.org]

exclude icu, simplejson, curl from repacked source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8dbc74e0f84113931bf99de3565326d1c39c1cb7
X-Git-Newrev: ea95faa844c460df31b7cc48c50f9976dfa623df

The following commit has been merged in the master branch:
commit 7fdae889511ef785a7c039b2ffaf6a361789fa35
Merge: b80f31528639b55552b92bec5e3b9c657e8dfd3c 8dbc74e0f84113931bf99de3565326d1c39c1cb7
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Jun 24 14:10:37 2012 -0400

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/rules

diff --combined debian/rules
index 96f6709,61d4f7a..b1b69c1
--- a/debian/rules
+++ b/debian/rules
@@@ -22,18 -22,18 +22,21 @@@ DEB_INSTALL_MANPAGES_supercollider-vi
  
  DEB_CMAKE_EXTRA_FLAGS = -DDSO_VISIBILITY=on -DSUPERNOVA=on -DSC_EL_BYTECOMPILE=OFF
  
- # Exclude external libraries from the source package
- # (copyright & maintenance concerns)
- DEB_UPSTREAM_REPACKAGE_EXCLUDES = external_libraries/boost/
- DEB_UPSTREAM_REPACKAGE_EXCLUDES += external_libraries/sndfile.hh
- DEB_UPSTREAM_REPACKAGE_EXCLUDES += external_libraries/simplejson-2.3.2/
+ # 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/sndfile.hh \
+ 				  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
  DEB_UPSTREAM_TARBALL_SRCDIR = SuperCollider-Source
  DEB_UPSTREAM_TARBALL_MD5 = 84fde920c32e9644902f989136a35b91
 +DEB_UPSTREAM_REPACKAGE_DELIMITER = +
 +DEB_UPSTREAM_REPACKAGE_TAG = repack
  
  binary-fixup/supercollider-common::
  	dh_linktree -psupercollider-common

-- 
supercollider packaging