Bug#864373: unblock: ycmd/0+20161219+git486b809-2.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ycmd
unblock ycmd/0+20161219+git486b809-2.1
README.Debian | 8 +++++---
changelog | 16 ++++++++++++++++
patches/05-tern-support.patch | 14 ++++++++------
rules | 4 +++-
4 files changed, 32 insertions(+), 10 deletions(-)
diff -Nru ycmd-0+20161219+git486b809/debian/changelog ycmd-0+20161219+git486b809/debian/changelog
--- ycmd-0+20161219+git486b809/debian/changelog 2017-01-26 11:57:23.000000000 +0200
+++ ycmd-0+20161219+git486b809/debian/changelog 2017-06-07 12:13:33.000000000 +0300
@@ -1,3 +1,19 @@
+ycmd (0+20161219+git486b809-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Run fewer tests on mipsel and mips64el, some fail on Loongson buildds.
+ (Closes: #852962)
+
+ -- Adrian Bunk <bunk@debian.org> Wed, 07 Jun 2017 12:13:33 +0300
+
+ycmd (0+20161219+git486b809-2) unstable; urgency=low
+
+ * Fix clang version detection in override_dh_link. (Closes: #861483)
+ * Try to find tern executable in $PATH and then set PATH_TO_TERN_BINARY
+ to ~/.npm-packages/bin/tern. (Closes: #859883)
+
+ -- Onur Aslan <onur@onur.im> Mon, 08 May 2017 11:23:19 +0300
+
ycmd (0+20161219+git486b809-1) unstable; urgency=low
* New upstream release. (Closes: #850144)
diff -Nru ycmd-0+20161219+git486b809/debian/patches/05-tern-support.patch ycmd-0+20161219+git486b809/debian/patches/05-tern-support.patch
--- ycmd-0+20161219+git486b809/debian/patches/05-tern-support.patch 2017-01-03 19:57:25.000000000 +0200
+++ ycmd-0+20161219+git486b809/debian/patches/05-tern-support.patch 2017-05-08 11:23:19.000000000 +0300
@@ -3,7 +3,7 @@
--- a/ycmd/completers/javascript/tern_completer.py
+++ b/ycmd/completers/javascript/tern_completer.py
-@@ -36,20 +36,12 @@
+@@ -36,20 +36,15 @@
_logger = logging.getLogger( __name__ )
@@ -17,12 +17,14 @@
- 'tern_runtime',
- 'node_modules',
- 'tern',
-- 'bin',
++PATH_TO_TERN_BINARY = utils.PathToFirstExistingExecutable( [ 'tern' ] )
++if not PATH_TO_TERN_BINARY:
++ PATH_TO_TERN_BINARY = os.path.join(
++ os.path.expanduser('~'),
++ '.npm-packages',
+ 'bin',
- 'tern' ) )
-+PATH_TO_TERN_BINARY = os.path.join(
-+ os.path.expanduser('~'),
-+ 'node_modules',
-+ 'tern')
++ 'tern')
-PATH_TO_NODE = utils.PathToFirstExistingExecutable( [ 'node' ] )
+PATH_TO_NODE = utils.PathToFirstExistingExecutable( [ 'nodejs' ] )
diff -Nru ycmd-0+20161219+git486b809/debian/README.Debian ycmd-0+20161219+git486b809/debian/README.Debian
--- ycmd-0+20161219+git486b809/debian/README.Debian 2016-03-30 12:41:11.000000000 +0300
+++ ycmd-0+20161219+git486b809/debian/README.Debian 2017-05-08 11:23:19.000000000 +0300
@@ -67,10 +67,12 @@
---------------------
ycmd patched in this package to provide easy JavaScript semantic completion.
-Install npm package and install tern package with npm:
+ycmd will try to find tern executable in $PATH and if it's not available
+it will check for locally installed version in: $HOME/.npm-packages/bin/tern
+You can install tern with npm:
- $ npm install tern
+ $ npm install -g tern
-This command will install tern package into $HOME/node_modules/tern directory.
+This command will install tern package into $HOME/.npm-packages directory.
ycmd will use this directory for tern based JavaScript semantic code
completion.
diff -Nru ycmd-0+20161219+git486b809/debian/rules ycmd-0+20161219+git486b809/debian/rules
--- ycmd-0+20161219+git486b809/debian/rules 2017-01-26 11:57:23.000000000 +0200
+++ ycmd-0+20161219+git486b809/debian/rules 2017-06-07 12:13:33.000000000 +0300
@@ -43,9 +43,11 @@
# Test JediHTTP
HOME=$(CURDIR) nosetests -w third_party/JediHTTP -v --with-id -d --no-byte-compile --exclude=test_good_gotoassignment_follow_imports
HOME=$(CURDIR) nosetests3 -w third_party/JediHTTP -v --with-id -d --no-byte-compile --exclude=test_good_gotoassignment_follow_imports
+ifeq (,$(filter $(DEB_HOST_ARCH), mipsel mips64el))
# Some tests requires UTF-8 compatible locale
HOME=$(CURDIR) LC_ALL=C.UTF-8 ./run_tests.py --skip-build --no-byte-compile $(EXCLUDE_TEST_PARAMS)
endif
+endif
override_dh_auto_clean:
dh_auto_clean
@@ -74,7 +76,7 @@
chmod 755 $(DEB_INSTALL_DIR)/usr/lib/ycmd/ycmd/__main__.py
override_dh_link:
- $(eval YCMD_CLANG_VER=$(shell objdump -x ycm_core.so | grep -oP 'libclang-\K(\d+\.\d+)'))
+ $(eval YCMD_CLANG_VER=$(shell objdump -x ycm_core.so | grep -oP 'NEED.*libclang-\K(\d+\.\d+)'))
echo "misc:Clang-Ver=$(YCMD_CLANG_VER)" >> debian/ycmd.substvars
dh_link -pycmd usr/lib/clang/$(YCMD_CLANG_VER)/include usr/lib/ycmd/clang_includes/include
Reply to: