[vim] 01/01: Merge DEB_VENDOR-guarded changes from Ubuntu

[James McCoy]

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

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

commit 5f626767278941b76ee253e20783517c48ef769c
Author: James McCoy <jamessan at debian.org>
Date:   Mon Jun 26 23:40:48 2017 -0400

    Merge DEB_VENDOR-guarded changes from Ubuntu
    
    - Ruby is disabled for vim-gtk3
    - Ensure python3 is enabled for vim-basic
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 3 +++
 debian/rules     | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 488d13c..6d2436b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ vim (2:8.0.0646-1) UNRELEASED; urgency=medium
   * vim-policy:
     + Specify the "addon", not "name", field is used to declare the addon.
       Thanks to Reiner Herrmann.
+  * Merge changes from Ubuntu, dependent on DEB_VENDOR=Ubuntu:
+    + Remove --disable-python3interp on Ubuntu for vim-basic
+    + Disable ruby for vim-gtk3
 
  -- James McCoy <jamessan at debian.org>  Sat, 17 Jun 2017 21:51:10 -0400
 
diff --git a/debian/rules b/debian/rules
index 9b76c98..ca335ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,10 +100,12 @@ NOINTERPFLAGS+=--disable-mzschemeinterp
 NOINTERPFLAGS+=--disable-perlinterp
 ifeq ($(DEB_VENDOR),Ubuntu)
 	NOINTERPFLAGS+=--enable-python3interp --with-python3-config-dir=$(shell python3-config --configdir)
+	NOINTERPFLAGS+=--disable-pythoninterp
+	GTK3FLAGS+=--disable-rubyinterp
 else
 	NOINTERPFLAGS+=--disable-pythoninterp
+	NOINTERPFLAGS+=--disable-python3interp
 endif
-NOINTERPFLAGS+=--disable-python3interp
 NOINTERPFLAGS+=--disable-rubyinterp
 NOINTERPFLAGS+=--disable-tclinterp
 
@@ -151,7 +153,7 @@ CFLAGS_vim-gtk:=$(CFLAGS)
 CFGFLAGS_vim-gtk:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTK2FLAGS) $(ALLINTERPFLAGS)
 
 CFLAGS_vim-gtk3:=$(CFLAGS)
-CFGFLAGS_vim-gtk3:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTK3FLAGS) $(ALLINTERPFLAGS)
+CFGFLAGS_vim-gtk3:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(ALLINTERPFLAGS) $(GTK3FLAGS)
 
 CFLAGS_vim-athena:=$(CFLAGS)
 CFGFLAGS_vim-athena:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(ATHENAFLAGS) $(ALLINTERPFLAGS)

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