[SCM] supercollider/master: Unfuzz and refresh patches.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4e849f91406a38919e7e9f9552cd931c6e43b024
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jun 11 16:48:07 2011 +0200

    Unfuzz and refresh patches.

diff --git a/debian/patches/02_disable_elisp_compilation.diff b/debian/patches/02_disable_elisp_compilation.diff
index 7b14403..2b3a3e2 100644
--- a/debian/patches/02_disable_elisp_compilation.diff
+++ b/debian/patches/02_disable_elisp_compilation.diff
@@ -3,11 +3,10 @@ Description: Do not byte compile .el files
  upon in other systems.
 Forwarded: not-needed
 Author: Артём Попов <artfwo at gmail.com>
-Index: supercollider/common/SConstruct
-===================================================================
---- supercollider.orig/common/SConstruct	2010-10-05 18:53:48.000000000 -0400
-+++ supercollider/common/SConstruct	2010-10-05 18:57:23.000000000 -0400
-@@ -1236,10 +1236,10 @@
+Last-Update: 2011-06-11
+--- a/common/SConstruct
++++ b/common/SConstruct
+@@ -1272,10 +1272,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 b7c92a9..1fbc3b3 100644
--- a/debian/patches/03_fix_elisp_install_path.diff
+++ b/debian/patches/03_fix_elisp_install_path.diff
@@ -1,11 +1,10 @@
 Description: Install elisp files into a package-specific subdir.
 Forwarded: no
 Author: Артём Попов <artfwo at gmail.com>
-Index: supercollider/common/SConstruct
-===================================================================
---- supercollider.orig/common/SConstruct	2010-10-05 18:57:23.000000000 -0400
-+++ supercollider/common/SConstruct	2010-10-05 18:57:37.000000000 -0400
-@@ -1237,7 +1237,7 @@
+Last-Update: 2011-06-11
+--- a/common/SConstruct
++++ b/common/SConstruct
+@@ -1273,7 +1273,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/06_deb_scvim.diff b/debian/patches/06_deb_scvim.diff
index 484427e..ac653df 100644
--- a/debian/patches/06_deb_scvim.diff
+++ b/debian/patches/06_deb_scvim.diff
@@ -1,10 +1,9 @@
 Description: Do not build help at build time
  It will be built at first run.
 Forwarded: no
-Index: supercollider/editors/scvim/SConstruct
-===================================================================
---- supercollider.orig/editors/scvim/SConstruct	2010-10-05 18:53:49.000000000 -0400
-+++ supercollider/editors/scvim/SConstruct	2010-10-05 18:57:40.000000000 -0400
+Last-Update: 2011-06-11
+--- a/editors/scvim/SConstruct
++++ b/editors/scvim/SConstruct
 @@ -91,18 +91,18 @@
  	DEFAULT_SC_HELP, PathOption.PathIsDir))
  
diff --git a/debian/patches/07_deb_sced.diff b/debian/patches/07_deb_sced.diff
index 1e8c62d..9c5396a 100644
--- a/debian/patches/07_deb_sced.diff
+++ b/debian/patches/07_deb_sced.diff
@@ -1,10 +1,9 @@
 Description: Do not update mime database at build
 Forwarded: no
 Author: Артём Попов <artfwo at gmail.com>
-Index: supercollider/editors/sced/SConstruct
-===================================================================
---- supercollider.orig/editors/sced/SConstruct	2010-10-05 18:53:49.000000000 -0400
-+++ supercollider/editors/sced/SConstruct	2010-10-05 18:57:43.000000000 -0400
+Last-Update: 2011-06-11
+--- a/editors/sced/SConstruct
++++ b/editors/sced/SConstruct
 @@ -123,7 +123,7 @@
  update_mime = Builder(action =
  		'update-mime-database ' + os.path.join( share_dir(PREFIX), 'mime/packages' ) )
diff --git a/debian/patches/10_fix_rpath.diff b/debian/patches/10_fix_rpath.diff
index 78623f0..c1aa73f 100644
--- a/debian/patches/10_fix_rpath.diff
+++ b/debian/patches/10_fix_rpath.diff
@@ -1,11 +1,10 @@
 Description: Do not set rpath on binaries
 Author: Артём Попов <artfwo at gmail.com>
 Forwarded: no
-Index: supercollider/common/SConstruct
-===================================================================
---- supercollider.orig/common/SConstruct	2010-10-05 18:57:37.000000000 -0400
-+++ supercollider/common/SConstruct	2010-10-05 18:57:48.000000000 -0400
-@@ -778,7 +778,7 @@
+Last-Update: 2011-06-11
+--- a/common/SConstruct
++++ b/common/SConstruct
+@@ -788,7 +788,7 @@
  elif PLATFORM == 'linux':
      serverEnv.Append(
                  CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
@@ -14,7 +13,7 @@ Index: supercollider/common/SConstruct
  
  elif PLATFORM == 'freebsd':
      serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
-@@ -1011,12 +1011,12 @@
+@@ -1041,12 +1041,12 @@
                  CPPPATH = ['#include/icu/unicode'])
  elif PLATFORM == 'linux':
      langEnv.Append(

-- 
supercollider packaging