[Pkg-ocaml-maint-commits] [ocp-indent] 01/02: add Christopher Zimmerman to d/copyright and make vim plugin functional

[Johannes Schauer]

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

josch pushed a commit to branch master
in repository ocp-indent.

commit d3cbc56fa38838f974c00aab6ad7d25fba87dc0c
Author: Johannes Schauer <josch at debian.org>
Date:   Tue Jun 9 07:04:48 2015 +0200

    add Christopher Zimmerman to d/copyright and make vim plugin functional
---
 debian/README.Debian      | 2 +-
 debian/changelog          | 7 +++++++
 debian/copyright          | 4 ++++
 debian/ocp-indent.install | 2 +-
 debian/rules              | 4 ++--
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index e20453c..d58d07f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,7 +10,7 @@ Emacs:
 
 Vim:
 
-    echo 'autocmd FileType ocaml source /usr/share/vim/addons/syntax/ocp-indent.vim' >>~/.vimrc
+    echo 'set rtp^=/usr/share/ocp-indent/vim' >> ~/.vimrc
 
 Configuration
 -------------
diff --git a/debian/changelog b/debian/changelog
index 68c88dc..d66f95d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocp-indent (1.5-2) UNRELEASED; urgency=medium
+
+  * add Christopher Zimmerman to d/copyright, install vim plugin in different
+    path and update its usage instructions (closes: #783869)
+
+ -- Johannes Schauer <josch at debian.org>  Tue, 09 Jun 2015 07:02:33 +0200
+
 ocp-indent (1.5-1) unstable; urgency=medium
 
   * new upstream release
diff --git a/debian/copyright b/debian/copyright
index f6a2c66..ddfd18c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,10 @@ Copyright: 1996-2011 INRIA
            2011-2013 OCamlPro
 License: LGPL-3 with OCaml-linking exception
 
+Files: tools/ocp-indent.vim
+Copyright: 2014 Christopher Zimmerman
+License: LGPL-3 with OCaml-linking exception
+
 Files: m4/ocaml.m4
 Copyright: 2000-2005, Georges Mariano
            2000-2005, Jean-Christophe Filliâtre
diff --git a/debian/ocp-indent.install b/debian/ocp-indent.install
index 8e43a62..afc00ec 100644
--- a/debian/ocp-indent.install
+++ b/debian/ocp-indent.install
@@ -1,3 +1,3 @@
 usr/bin/ocp-indent
-usr/share/vim/addons/syntax/ocp-indent.vim
+usr/share/ocp-indent/vim/indent/ocaml.vim
 usr/share/emacs/site-lisp/ocp-indent.el
diff --git a/debian/rules b/debian/rules
index 0f7b905..303c910 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,6 @@ override_dh_auto_install:
 	cp _build/$(INDENTMAIN) $(DESTDIR)/usr/bin/ocp-indent
 	mkdir -p $(DESTDIR)/usr/share/emacs/site-lisp
 	cp tools/ocp-indent.el $(DESTDIR)/usr/share/emacs/site-lisp/ocp-indent.el
-	mkdir -p $(DESTDIR)/usr/share/vim/addons/syntax
-	cp tools/ocp-indent.vim $(DESTDIR)/usr/share/vim/addons/syntax/ocp-indent.vim
+	mkdir -p $(DESTDIR)/usr/share/ocp-indent/vim/indent
+	cp tools/ocp-indent.vim $(DESTDIR)/usr/share/ocp-indent/vim/indent/ocaml.vim
 	dh_auto_install -- -f Makefile.simple

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocp-indent.git