[SCM] supercollider/master: refresh patches

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

The following commit has been merged in the master branch:
commit 940eba6f83611d28a57f462f3728b1dc1bd11ea8
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sun Jan 15 15:55:35 2012 +0000

    refresh patches

diff --git a/debian/patches/02_disable_elisp_compilation.diff b/debian/patches/02_disable_elisp_compilation.diff
index 2b3a3e2..7bb5b46 100644
--- a/debian/patches/02_disable_elisp_compilation.diff
+++ b/debian/patches/02_disable_elisp_compilation.diff
@@ -6,7 +6,7 @@ Author: Артём Попов <artfwo at gmail.com>
 Last-Update: 2011-06-11
 --- a/common/SConstruct
 +++ b/common/SConstruct
-@@ -1272,10 +1272,10 @@
+@@ -1273,10 +1273,10 @@
                  'sed \'s, at PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
                  pkg_data_dir(FINAL_PREFIX))
      el_files = glob.glob('../editors/scel/el/*.el') + ['../editors/scel/el/sclang-vars.el']
diff --git a/debian/patches/03_fix_elisp_install_path.diff b/debian/patches/03_fix_elisp_install_path.diff
index 1fbc3b3..c62c79a 100644
--- a/debian/patches/03_fix_elisp_install_path.diff
+++ b/debian/patches/03_fix_elisp_install_path.diff
@@ -4,7 +4,7 @@ Author: Артём Попов <artfwo at gmail.com>
 Last-Update: 2011-06-11
 --- a/common/SConstruct
 +++ b/common/SConstruct
-@@ -1273,7 +1273,7 @@
+@@ -1274,7 +1274,7 @@
                  pkg_data_dir(FINAL_PREFIX))
      el_files = glob.glob('../editors/scel/el/*.el') + ['../editors/scel/el/sclang-vars.el']
      elc_files = [] #map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
diff --git a/debian/patches/10_fix_rpath.diff b/debian/patches/10_fix_rpath.diff
index c1aa73f..b43eec6 100644
--- a/debian/patches/10_fix_rpath.diff
+++ b/debian/patches/10_fix_rpath.diff
@@ -4,7 +4,7 @@ Forwarded: no
 Last-Update: 2011-06-11
 --- a/common/SConstruct
 +++ b/common/SConstruct
-@@ -788,7 +788,7 @@
+@@ -789,7 +789,7 @@
  elif PLATFORM == 'linux':
      serverEnv.Append(
                  CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
@@ -13,7 +13,7 @@ Last-Update: 2011-06-11
  
  elif PLATFORM == 'freebsd':
      serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
-@@ -1041,12 +1041,12 @@
+@@ -1042,12 +1042,12 @@
                  CPPPATH = ['#include/icu/unicode'])
  elif PLATFORM == 'linux':
      langEnv.Append(
@@ -26,5 +26,5 @@ Last-Update: 2011-06-11
 -    LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
 +    LINKFLAGS = '-Wl,-rpath-link,build -Wl,-rpath-link,' + FINAL_PREFIX + '/lib')
  
- if env['CURL']:
-     langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
+ libsclangEnv = langEnv.Clone(
+     PKGCONFIG_NAME = 'libsclang',

-- 
supercollider packaging