[SCM] supercollider/master: Refresh patches

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Wed Oct 6 05:24:43 UTC 2010 

The following commit has been merged in the master branch:
commit cd0b8f9aa21e4c22317263a76a7745b74a4783ca
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Oct 5 18:59:35 2010 -0400

    Refresh patches

diff --git a/debian/patches/02_disable_elisp_compilation.diff b/debian/patches/02_disable_elisp_compilation.diff
index 49281c3..68f8988 100644
--- a/debian/patches/02_disable_elisp_compilation.diff
+++ b/debian/patches/02_disable_elisp_compilation.diff
@@ -1,7 +1,8 @@
-diff -Nur -x '*.orig' -x '*~' trunk/common/SConstruct trunk.new/common/SConstruct
---- trunk/common/SConstruct	2009-01-14 19:04:59.000000000 +0600
-+++ trunk.new/common/SConstruct	2009-01-17 13:27:13.000000000 +0600
-@@ -1235,10 +1235,10 @@
+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 @@
                  '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 814151c..e481138 100644
--- a/debian/patches/03_fix_elisp_install_path.diff
+++ b/debian/patches/03_fix_elisp_install_path.diff
@@ -1,7 +1,8 @@
-diff -Nur -x '*.orig' -x '*~' trunk/common/SConstruct trunk.new/common/SConstruct
---- trunk/common/SConstruct	2009-02-18 20:12:16.023273046 +0600
-+++ trunk.new/common/SConstruct	2009-02-18 20:12:41.272261640 +0600
-@@ -1236,7 +1236,7 @@
+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 @@
                  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 a06c7b2..8d0b844 100644
--- a/debian/patches/06_deb_scvim.diff
+++ b/debian/patches/06_deb_scvim.diff
@@ -1,6 +1,7 @@
-diff -Nur -x '*.orig' -x '*~' trunk/editors/scvim/SConstruct trunk.new/editors/scvim/SConstruct
---- trunk/editors/scvim/SConstruct	2009-03-22 21:42:03.000000000 +0600
-+++ trunk.new/editors/scvim/SConstruct	2009-03-25 21:34:10.110845582 +0600
+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
 @@ -91,18 +91,18 @@
  	DEFAULT_SC_HELP, PathOption.PathIsDir))
  
@@ -38,7 +39,7 @@ diff -Nur -x '*.orig' -x '*~' trunk/editors/scvim/SConstruct trunk.new/editors/s
 -Depends(build_help, install_doc)
 +#Depends(build_help, install_doc)
  
- install_bin = env.Alias('install-bin', 
+ install_bin = env.Alias('install-bin',
  		install_dir(env, 'bin', bin_dir(PREFIX), ANY_FILE_RE, 1))
 @@ -142,7 +142,7 @@
  env.Alias('install-all', [
diff --git a/debian/patches/07_deb_sced.diff b/debian/patches/07_deb_sced.diff
index f69b1a9..01bc1a9 100644
--- a/debian/patches/07_deb_sced.diff
+++ b/debian/patches/07_deb_sced.diff
@@ -1,12 +1,13 @@
-diff -Nur -x '*.orig' -x '*~' trunk/editors/sced/SConstruct trunk.new/editors/sced/SConstruct
---- trunk/editors/sced/SConstruct	2009-02-19 09:28:47.415135000 +0600
-+++ trunk.new/editors/sced/SConstruct	2009-02-19 11:34:24.784124655 +0600
+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
 @@ -123,7 +123,7 @@
- update_mime = Builder(action = 
+ update_mime = Builder(action =
  		'update-mime-database ' + os.path.join( share_dir(PREFIX), 'mime/packages' ) )
  
 -env.BUILDERS = update_mime
 +#env.BUILDERS = update_mime
  
  #install_doc = env.Alias('install-doc', env.Install(DOC_DIR, ['SCVim.scd']))
- #build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR), 
+ #build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
diff --git a/debian/patches/08_deb_scvim_checkactive.diff b/debian/patches/08_deb_scvim_checkactive.diff
index 4ee7249..e2fe124 100644
--- a/debian/patches/08_deb_scvim_checkactive.diff
+++ b/debian/patches/08_deb_scvim_checkactive.diff
@@ -1,6 +1,7 @@
-diff -Nur -x '*.orig' -x '*~' trunk/editors/scvim/bin/scvim trunk.new/editors/scvim/bin/scvim
---- trunk/editors/scvim/bin/scvim	2008-09-18 07:53:07.683234000 +0700
-+++ trunk.new/editors/scvim/bin/scvim	2009-03-29 15:09:02.718881266 +0700
+Index: supercollider/editors/scvim/bin/scvim
+===================================================================
+--- supercollider.orig/editors/scvim/bin/scvim	2010-10-05 18:53:49.000000000 -0400
++++ supercollider/editors/scvim/bin/scvim	2010-10-05 18:57:45.000000000 -0400
 @@ -31,6 +31,24 @@
  #the location of the rc file to source
  rcloc = nil
diff --git a/debian/patches/10_fix_rpath.diff b/debian/patches/10_fix_rpath.diff
index fde3ad5..267caab 100644
--- a/debian/patches/10_fix_rpath.diff
+++ b/debian/patches/10_fix_rpath.diff
@@ -1,6 +1,7 @@
-diff -Nur -x '*.orig' -x '*~' trunk/common/SConstruct trunk.new/common/SConstruct
---- trunk/common/SConstruct	2010-02-22 01:27:04.000000000 +0600
-+++ trunk.new/common/SConstruct	2010-02-25 21:52:11.842092870 +0600
+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 @@
  elif PLATFORM == 'linux':
      serverEnv.Append(
@@ -10,7 +11,7 @@ diff -Nur -x '*.orig' -x '*~' trunk/common/SConstruct trunk.new/common/SConstruc
  
  elif PLATFORM == 'freebsd':
      serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
-@@ -1012,12 +1012,12 @@
+@@ -1011,12 +1011,12 @@
                  CPPPATH = ['#include/icu/unicode'])
  elif PLATFORM == 'linux':
      langEnv.Append(

-- 
supercollider packaging

More information about the pkg-multimedia-commits mailing list