[vim] 07/20: Adjust Provides/Description if ruby/perl bindings are disabled

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 8d0a4ad70a89f0f0232a200e95ba2628fd9d1b3f
Author: James McCoy <jamessan at debian.org>
Date:   Sun Aug 13 10:26:24 2017 -0400

    Adjust Provides/Description if ruby/perl bindings are disabled
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/control | 5 +++--
 debian/rules   | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index c2db484..c4b35c6 100644
--- a/debian/control
+++ b/debian/control
@@ -202,7 +202,7 @@ Provides:
  vim,
  vim-lua,
  vim-python,
- vim-ruby,
+ ${vim:Ruby-Provides},
  vim-tcl,
  ${vim:Perl-Provides},
 Description: Vi IMproved - enhanced vi editor - with GTK3 GUI
@@ -213,7 +213,8 @@ Description: Vi IMproved - enhanced vi editor - with GTK3 GUI
  completion, block operations, folding, Unicode support, etc.
  .
  This package contains a version of vim compiled with a GTK3 GUI
- and support for scripting with Lua, Perl, Python, Ruby, and Tcl.
+ and support for scripting with Lua,${vim:Perl-Desc}
+ Python,${vim:Ruby-Desc} and Tcl.
 
 Package: vim-nox
 Priority: optional
diff --git a/debian/rules b/debian/rules
index 42d3eb0..fbf2419 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,9 +85,11 @@ ifeq ($(DEB_VENDOR),Ubuntu)
 	NOINTERPFLAGS+=--enable-python3interp --with-python3-config-dir=$(shell python3-config --configdir)
 	NOINTERPFLAGS+=--disable-pythoninterp
 	GTK3FLAGS+=--disable-rubyinterp
+	RUBY_SUBSTVARS=
 else
 	NOINTERPFLAGS+=--disable-pythoninterp
 	NOINTERPFLAGS+=--disable-python3interp
+	RUBY_SUBSTVARS=-Vvim:Ruby-Provides=vim-ruby -Vvim:Ruby-Desc=" Ruby,"
 endif
 NOINTERPFLAGS+=--disable-rubyinterp
 NOINTERPFLAGS+=--disable-tclinterp
@@ -97,10 +99,10 @@ ALLINTERPFLAGS+=--disable-mzschemeinterp
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
   # Until #827319 is resolved
   ALLINTERPFLAGS+=--disable-perlinterp
-  PERL_SUBSTVAR=
+  PERL_SUBSTVARS=
 else
   ALLINTERPFLAGS+=--enable-perlinterp
-  PERL_SUBSTVAR=-Vvim:Perl-Provides=vim-perl
+  PERL_SUBSTVARS=-Vvim:Perl-Provides=vim-perl -Vvim:Perl-Desc=" Perl,"
 endif
 ALLINTERPFLAGS+=--enable-python3interp --with-python3-config-dir=$(shell python3-config --configdir)
 ALLINTERPFLAGS+=--disable-pythoninterp
@@ -464,7 +466,7 @@ binary-arch-%: install-stamp-%
 	dh_lintian
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- $(PERL_SUBSTVAR)
+	dh_gencontrol -- $(PERL_SUBSTVARS) $(RUBY_SUBSTVARS)
 	dh_md5sums
 	dh_builddeb -- -Zxz
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git