Merge pull request #2987 from melissaanne/ticket/master/update-vim-files

(PUP-3070) Update vimfiles included in Puppet
puppetlabs · Sep 17, 2014 · 5e60920 · 5e60920
2 parents a831ef4 + 1b84d31
commit 5e60920
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/ext/debian/rules b/ext/debian/rules
@@ -59,6 +59,10 @@ install: build
 		$(CURDIR)/debian/vim-puppet/usr/share/vim/addons/syntax/
 	$(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim				\
 		$(CURDIR)/debian/vim-puppet/usr/share/vim/addons/ftdetect/
+	$(INSTALL) -m0644 ext/vim/indent/puppet.vim				\
+		$(CURDIR)/debian/vim-puppet/usr/share/vim/addons/indent/
+	$(INSTALL) -m0644 ext/vim/ftplugin/puppet.vim				\
+		$(CURDIR)/debian/vim-puppet/usr/share/vim/addons/ftplugin/
 	$(INSTALL) -m0644 debian/vim-puppet.yaml				\
 		$(CURDIR)/debian/vim-puppet/usr/share/vim/registry/
 

diff --git a/ext/debian/vim-puppet.dirs b/ext/debian/vim-puppet.dirs
@@ -1,3 +1,5 @@
 usr/share/vim/registry
 usr/share/vim/addons/syntax
 usr/share/vim/addons/ftdetect
+usr/share/vim/addons/indent
+usr/share/vim/addons/ftplugin
diff --git a/ext/debian/vim-puppet.yaml b/ext/debian/vim-puppet.yaml
@@ -3,3 +3,5 @@ description: "Syntax highlighting for puppet"
 files:
   - ftdetect/puppet.vim
   - syntax/puppet.vim
+  - indent/puppet.vim
+  - ftplugin/puppet.vim
diff --git a/ext/redhat/puppet.spec.erb b/ext/redhat/puppet.spec.erb
@@ -169,6 +169,8 @@ install -Dp -m0644 ext/emacs/puppet-mode-init.el \
 vimdir=%{buildroot}%{_datadir}/vim/vimfiles
 install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
 install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
+install -Dp -m0644 ext/vim/indent/puppet.vim $vimdir/indent/puppet.vim
+install -Dp -m0644 ext/vim/ftplugin/puppet.vim $vimdir/ftplugin/puppet.vim
 
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 # Setup tmpfiles.d config