[SCM] supercollider/master: backport fix to vim plugin from upstream

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

The following commit has been merged in the master branch:
commit c34c664c3e0d310300b0a27ba58a1893e8e23e33
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Thu Jun 14 20:14:55 2012 +0100

    backport fix to vim plugin from upstream

diff --git a/debian/patches/scvim_fix_registry.patch b/debian/patches/scvim_fix_registry.patch
new file mode 100644
index 0000000..7875538
--- /dev/null
+++ b/debian/patches/scvim_fix_registry.patch
@@ -0,0 +1,12 @@
+# backport commit 05114d6a02479 to fix vim plugin. patch will be superceded in sc 3.5.3+
+--- a/editors/scvim/registry/supercollider-vim.yaml.in
++++ b/editors/scvim/registry/supercollider-vim.yaml.in
+@@ -4,7 +4,7 @@
+ basedir: @CMAKE_INSTALL_PREFIX@/share/vim/addons/
+ files:
+   - ftplugin/supercollider.vim
+-  - indent/sc_indent.vim
++  - indent/supercollider.vim
+   - syntax/supercollider.vim
+   - syntax/supercollider_lang.vim
+   - syntax/supercollider_objects.vim
diff --git a/debian/patches/series b/debian/patches/series
index 06a6e6a..47ef197 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 install_readme_extensions.patch
 fix_scvim.sc_permissions.patch
 use_system_boost.patch
+scvim_fix_registry.patch
diff --git a/debian/patches/use_system_boost.patch b/debian/patches/use_system_boost.patch
index 0a344ae..8a74244 100644
--- a/debian/patches/use_system_boost.patch
+++ b/debian/patches/use_system_boost.patch
@@ -2,10 +2,8 @@
 # Backported from supercollider git master to 3.5
 # Backported these commits: 452e9881cf5baca2b, 5ea30c698f10ec, 9913b2d92f
 
-Index: supercollider/CMakeLists.txt
-===================================================================
---- supercollider.orig/CMakeLists.txt	2012-05-12 17:57:29.208102870 +0100
-+++ supercollider/CMakeLists.txt	2012-05-12 18:27:14.564151260 +0100
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -125,32 +125,11 @@
          SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_RELEASE} /MTd")
          SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} /MT")
@@ -85,10 +83,8 @@ Index: supercollider/CMakeLists.txt
  # some preprocessor flags
  if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
  	if (SSE)
-Index: supercollider/external_libraries/CMakeLists.txt
-===================================================================
---- supercollider.orig/external_libraries/CMakeLists.txt	2012-05-12 17:57:29.224102867 +0100
-+++ supercollider/external_libraries/CMakeLists.txt	2012-05-12 18:27:14.564151260 +0100
+--- a/external_libraries/CMakeLists.txt
++++ b/external_libraries/CMakeLists.txt
 @@ -1,82 +1,71 @@
  if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/nova-simd/vec.hpp)
 -    message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
@@ -221,10 +217,8 @@ Index: supercollider/external_libraries/CMakeLists.txt
 +					 APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
 +	endif()
  endif()
-Index: supercollider/lang/CMakeLists.txt
-===================================================================
---- supercollider.orig/lang/CMakeLists.txt	2012-05-12 17:57:29.260102868 +0100
-+++ supercollider/lang/CMakeLists.txt	2012-05-12 18:29:50.236155477 +0100
+--- a/lang/CMakeLists.txt
++++ b/lang/CMakeLists.txt
 @@ -3,12 +3,17 @@
                      ${CMAKE_SOURCE_DIR}/include/plugin_interface
                      ${CMAKE_SOURCE_DIR}/include/server
@@ -261,7 +255,7 @@ Index: supercollider/lang/CMakeLists.txt
  
  file(GLOB yaml_sources ../external_libraries/yaml-cpp-0.3.0/src/*cpp)
  list(APPEND sclang_sources ${yaml_sources})
-@@ -186,6 +193,10 @@
+@@ -190,6 +197,10 @@
  	endif()
  endif()
  
@@ -272,7 +266,7 @@ Index: supercollider/lang/CMakeLists.txt
  if (SCLANG_SERVER)
  	target_link_libraries(libsclang libscsynth)
  else()
-@@ -253,14 +264,18 @@
+@@ -257,14 +268,18 @@
  	target_link_libraries(libsclang rt)
  endif()
  
@@ -293,10 +287,8 @@ Index: supercollider/lang/CMakeLists.txt
  
  set_property(TARGET sclang
  	APPEND
-Index: supercollider/server/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/CMakeLists.txt	2012-05-12 17:57:29.288102870 +0100
-+++ supercollider/server/CMakeLists.txt	2012-05-12 18:27:14.564151260 +0100
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
 @@ -3,17 +3,15 @@
  	add_definitions("-DSC_PLUGIN_EXT=\".so\"")
  endif()
@@ -320,10 +312,8 @@ Index: supercollider/server/CMakeLists.txt
 -  add_subdirectory(supernova)
 +	add_subdirectory(supernova)
  endif()
-Index: supercollider/server/supernova/CMakeLists.txt
-===================================================================
---- supercollider.orig/server/supernova/CMakeLists.txt	2012-05-12 17:57:29.316102874 +0100
-+++ supercollider/server/supernova/CMakeLists.txt	2012-05-12 18:27:14.564151260 +0100
+--- a/server/supernova/CMakeLists.txt
++++ b/server/supernova/CMakeLists.txt
 @@ -31,11 +31,17 @@
  
  

-- 
supercollider packaging