[Pkg-ocaml-maint-commits] r3985 - in /trunk/packages/ocaml-tools/trunk/debian: README.Debian changelog control dirs lintian-overrides ocaml-tools.config ocaml-tools.postinst ocaml-tools.prerm ocaml-tools.templates rules vim-omlet.yaml

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Thu Jul 12 12:32:03 UTC 2007 

Author: smimram
Date: Thu Jul 12 12:32:03 2007
New Revision: 3985

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3985
Log:
Comply with the new vim policy.

Added:
    trunk/packages/ocaml-tools/trunk/debian/vim-omlet.yaml
Removed:
    trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.config
    trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.postinst
    trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.prerm
    trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.templates
Modified:
    trunk/packages/ocaml-tools/trunk/debian/README.Debian
    trunk/packages/ocaml-tools/trunk/debian/changelog
    trunk/packages/ocaml-tools/trunk/debian/control
    trunk/packages/ocaml-tools/trunk/debian/dirs
    trunk/packages/ocaml-tools/trunk/debian/lintian-overrides
    trunk/packages/ocaml-tools/trunk/debian/rules

Modified: trunk/packages/ocaml-tools/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/README.Debian?rev=3985&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/README.Debian (original)
+++ trunk/packages/ocaml-tools/trunk/debian/README.Debian Thu Jul 12 12:32:03 2007
@@ -1,13 +1,13 @@
 Omlet
 -----
-Omlet is a replacement for the official vim mode for OCaml files. If you want to
-use it as a default vim mode, you should either answer yes at the debconf
-question about this or make symlinks by hand, typing the following in a root
-shell:
+This package provides the vim addon omlet which is a replacement for the
+official vim mode for OCaml files. It is not enable per default. If you want to
+enable it for your user account just execute
 
-for i in `cd /usr/share/ocaml-tools/omlet/; ls`; do
-    if [ ! -e /usr/share/vim/addons/$i/omlet.vim ]; then
-        mkdir -p /usr/share/vim/addons/$i
-        ln -s /usr/share/ocaml-tools/omlet/$i/omlet.vim /usr/share/vim/addons/$i/omlet.vim
-    fi
-done
+vim-addons install omlet
+
+Similarly, to enable it for all users of this system just execute (as root)
+vim-addons -w install omlet. vim-addons is provided by the vim-addon-manager
+package, have a look at its manpage for more information.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 12 Jul 2007 14:02:50 +0200

Modified: trunk/packages/ocaml-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/changelog?rev=3985&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-tools/trunk/debian/changelog Thu Jul 12 12:32:03 2007
@@ -1,3 +1,11 @@
+ocaml-tools (2007.06.24-2) unstable; urgency=low
+
+  * Comply to the new vim policy for omlet: recommend vim-addon-manager,
+    updated README.Debian, removed the debconf template, added a yaml file,
+    closes: #432519.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 12 Jul 2007 14:02:50 +0200
+
 ocaml-tools (2007.06.24-1) unstable; urgency=low
 
   [ Samuel Mimram ]

Modified: trunk/packages/ocaml-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/control?rev=3985&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/control (original)
+++ trunk/packages/ocaml-tools/trunk/debian/control Thu Jul 12 12:32:03 2007
@@ -11,10 +11,10 @@
 Package: ocaml-tools
 Architecture: all
 Depends: ${misc:Depends}
+Recommends: vim, vim-addon-manager
 Enhances: ocaml
-Suggests: autoconf, vim, otags
+Suggests: autoconf, otags
 Description: various tools for ocaml programmers
  This package collects various tools for ocaml programmers:
   - a configure.in and Makefile.in template
   - omlet: a better ocaml indentation mode for vim
-

Modified: trunk/packages/ocaml-tools/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/dirs?rev=3985&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/dirs (original)
+++ trunk/packages/ocaml-tools/trunk/debian/dirs Thu Jul 12 12:32:03 2007
@@ -1,4 +1,5 @@
 usr/share/doc/ocaml-tools
 usr/share/ocaml-tools
 usr/share/ocaml-tools/omlet
+usr/share/vim/registry
 usr/share/lintian/overrides

Modified: trunk/packages/ocaml-tools/trunk/debian/lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/lintian-overrides?rev=3985&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/lintian-overrides (original)
+++ trunk/packages/ocaml-tools/trunk/debian/lintian-overrides Thu Jul 12 12:32:03 2007
@@ -1,2 +1,1 @@
 ocaml-tools: wrong-name-for-upstream-changelog
-

Modified: trunk/packages/ocaml-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/rules?rev=3985&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/rules (original)
+++ trunk/packages/ocaml-tools/trunk/debian/rules Thu Jul 12 12:32:03 2007
@@ -5,11 +5,15 @@
 
 #OCAMLABI := $(shell ocamlc -version)
 
+DESTDIR := $(CURDIR)/debian/ocaml-tools
+
 # top level dir for documentation
-DOCDIR = debian/ocaml-tools/usr/share/doc/ocaml-tools
+DOCDIR = /usr/share/doc/ocaml-tools
 
 # share dir where files are to be installed
-SHDIR = debian/ocaml-tools/usr/share/ocaml-tools
+SHDIR = /usr/share/ocaml-tools
+
+VIMDIR = /usr/share/vim/addons
 
 # omlet source dir
 OMLETSRC = $(shell echo omlet-*)
@@ -28,14 +32,14 @@
 	dh_installdirs
 
 	# autoconf
-	cp autoconf/configure.in $(SHDIR)
-	cp autoconf/Makefile.in $(SHDIR)
+	cp autoconf/configure.in $(DESTDIR)/$(SHDIR)
+	cp autoconf/Makefile.in $(DESTDIR)/$(SHDIR)
 
 	# omlet
-	#BASE=$(CURDIR)/debian/ocaml-tools/usr/share/vim/addons make -C $(OMLETSRC) install-aux
-	BASE=$(CURDIR)/$(SHDIR)/omlet make -C $(OMLETSRC) install-aux
-	cp $(OMLETSRC)/README $(DOCDIR)/README.omlet
-	cp $(OMLETSRC)/ChangeLog $(DOCDIR)/changelog.omlet
+	BASE=$(DESTDIR)/$(VIMDIR) make -C $(OMLETSRC) install-aux
+	cp debian/vim-omlet.yaml $(DESTDIR)/usr/share/vim/registry
+	cp $(OMLETSRC)/README $(DESTDIR)/$(DOCDIR)/README.omlet
+	cp $(OMLETSRC)/ChangeLog $(DESTDIR)/$(DOCDIR)/changelog.omlet
 
 	cp debian/lintian-overrides \
 		debian/ocaml-tools/usr/share/lintian/overrides/ocaml-tools
@@ -58,4 +62,4 @@
 
 binary: binary-arch binary-indep
 
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install

Added: trunk/packages/ocaml-tools/trunk/debian/vim-omlet.yaml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/vim-omlet.yaml?rev=3985&op=file
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/vim-omlet.yaml (added)
+++ trunk/packages/ocaml-tools/trunk/debian/vim-omlet.yaml Thu Jul 12 12:32:03 2007
@@ -1,0 +1,8 @@
+addon: omlet
+description: "highlight and indent ocaml files"
+disabledby: "let loaded_omlet = 1"
+files:
+  - ftplugin/omlet.vim
+  - indent/omlet.vim
+  - syntax/omlet.vim
+  - ftdetect/omlet.vim

More information about the Pkg-ocaml-maint-commits mailing list