Description: use our script directory in plugin. This package uses same
 directory for third_party libraries.
Author: Onur Aslan <onur@onur.im>
Forwarded: not-needed

--- a/autoload/youcompleteme.vim
+++ b/autoload/youcompleteme.vim
@@ -47,9 +47,8 @@
 
   py import sys
   py import vim
-  exe 'python sys.path.insert( 0, "' . s:script_folder_path . '/../python" )'
+  exe 'python sys.path.insert( 0, "/usr/lib/vim-youcompleteme/" )'
   py from ycm import utils
-  py utils.AddThirdPartyFoldersToSysPath()
   py from ycm import base
   py base.LoadJsonDefaultsIntoVim()
   py from ycm import vimsupport
--- a/plugin/youcompleteme.vim
+++ b/plugin/youcompleteme.vim
@@ -37,7 +37,7 @@
 let s:script_folder_path = escape( expand( '<sfile>:p:h' ), '\' )
 
 function! s:HasYcmCore()
-  let path_prefix = s:script_folder_path . '/../python/'
+  let path_prefix = "/usr/lib/vim-youcompleteme/"
   if filereadable(path_prefix . 'ycm_client_support.so') &&
         \ filereadable(path_prefix . 'ycm_core.so')
     return 1
--- a/python/ycm/youcompleteme.py
+++ b/python/ycm/youcompleteme.py
@@ -92,7 +92,7 @@
       json.dump( dict( self._user_options ), options_file )
       options_file.flush()
       args = [ utils.PathToPythonInterpreter(),
-               _PathToServerScript(),
+               '/usr/lib/vim-youcompleteme/ycm/server/ycmd.py',
                '--port={0}'.format( server_port ),
                '--options_file={0}'.format( options_file.name ),
                '--log={0}'.format( self._user_options[ 'server_log_level' ] ),
--- a/python/ycm/server/server_utils.py
+++ b/python/ycm/server/server_utils.py
@@ -26,9 +26,4 @@
   # before the client/server architecture.
   # TODO: Fix things so that this is not needed anymore when we split ycmd into
   # a separate repository.
-  sys.path.insert( 0, os.path.join(
-                          os.path.dirname( os.path.abspath( __file__ ) ),
-                          '../..' ) )
-
-  from ycm import utils
-  utils.AddThirdPartyFoldersToSysPath()
+  sys.path.insert( 0, '/usr/lib/vim-youcompleteme/' )
--- a/python/ycm/user_options_store.py
+++ b/python/ycm/user_options_store.py
@@ -41,9 +41,7 @@
 
 
 def DefaultOptions():
-  settings_path = os.path.join(
-      os.path.dirname( os.path.abspath( __file__ ) ),
-      'server/default_settings.json' )
+  settings_path = '/usr/lib/vim-youcompleteme/ycm/server/default_settings.json'
   with open( settings_path ) as f:
     return json.loads( f.read() )