[Pkg-ocaml-maint-commits] r991 - in packages/ocaml-tools/trunk: . debian
Samuel Mimram
smimram-guest@costa.debian.org
Wed, 02 Mar 2005 12:39:10 +0100
Author: smimram-guest
Date: 2005-03-02 12:39:07 +0100 (Wed, 02 Mar 2005)
New Revision: 991
Added:
packages/ocaml-tools/trunk/debian/README.Debian
packages/ocaml-tools/trunk/debian/lintian-overrides
packages/ocaml-tools/trunk/ocaml-tools_2005.03.02.orig.tar.gz
Removed:
packages/ocaml-tools/trunk/ocaml-tools_2004.08.22.orig.tar.gz
Modified:
packages/ocaml-tools/trunk/debian/changelog
packages/ocaml-tools/trunk/debian/control
packages/ocaml-tools/trunk/debian/copyright
packages/ocaml-tools/trunk/debian/dirs
packages/ocaml-tools/trunk/debian/rules
Log:
Added omlet vim indentation mode.
Added: packages/ocaml-tools/trunk/debian/README.Debian
===================================================================
--- packages/ocaml-tools/trunk/debian/README.Debian 2005-02-25 15:02:30 UTC (rev 990)
+++ packages/ocaml-tools/trunk/debian/README.Debian 2005-03-02 11:39:07 UTC (rev 991)
@@ -0,0 +1,6 @@
+omlet
+-----
+To have vim loading automatically the omlet mode on ml and mli files, add the
+following line to your ~/.vimrc file:
+
+filetype plugin indent on
Modified: packages/ocaml-tools/trunk/debian/changelog
===================================================================
--- packages/ocaml-tools/trunk/debian/changelog 2005-02-25 15:02:30 UTC (rev 990)
+++ packages/ocaml-tools/trunk/debian/changelog 2005-03-02 11:39:07 UTC (rev 991)
@@ -1,3 +1,13 @@
+ocaml-tools (2005.03.02-1) unstable; urgency=low
+
+ * New upstream version 6.19.0 of OCamlMakefile.
+ * Added omlet indentation mode for OCaml files in vim (modified the
+ Description accordingly and added vim and otags to Suggests).
+ * Updated Standards-Version to 3.6.1.1.
+ * Added myself to the Uploaders.
+
+ -- Samuel Mimram <smimram@debian.org> Wed, 2 Mar 2005 12:07:52 +0100
+
ocaml-tools (2004.08.22-1) unstable; urgency=low
* New upstream version 6.18.0 of OcamlMakefile. This upstream release
@@ -15,7 +25,7 @@
* Refine (build-)dependencieson ocaml to nox packages
* Adapted patch 02_ocamlmake-incpath to ocaml 3.08 and this version of
OcamlMakefile
- * Added a lintian ovveride for the name of the OcamlMakefile upstream
+ * Added a lintian overide for the name of the OcamlMakefile upstream
changelog file
-- Ralf Treinen <treinen@debian.org> Tue, 27 Jul 2004 00:10:26 +0200
@@ -180,7 +190,6 @@
byte-code compiled ocamldot has to run on 3.01 (thanks: Sven Luther)
-- Ralf Treinen <treinen@debian.org> Fri, 6 Apr 2001 18:12:53 +0200
-
ocaml-tools (1.0-1) unstable; urgency=low
@@ -192,5 +201,3 @@
- ocamldot: 2001/03/26
-- Ralf Treinen <treinen@debian.org> Sat, 24 Mar 2001 18:49:15 +0100
-
-
Modified: packages/ocaml-tools/trunk/debian/control
===================================================================
--- packages/ocaml-tools/trunk/debian/control 2005-02-25 15:02:30 UTC (rev 990)
+++ packages/ocaml-tools/trunk/debian/control 2005-03-02 11:39:07 UTC (rev 991)
@@ -2,18 +2,18 @@
Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
-Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>
+Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>, Samuel Mimram <smimram@debian.org>
Build-Depends-Indep: debhelper (>= 4.0), ocaml-nox-3.08, dpatch
-Standards-Version: 3.6.1
+Standards-Version: 3.6.1.1
Package: ocaml-tools
Architecture: all
Depends: ocaml-base-nox-3.08
Enhances: ocaml
-Suggests: autoconf, graphviz
-Description: Various tools for ocaml programmers
+Suggests: autoconf, graphviz, vim, otags
+Description: various tools for ocaml programmers
This package collects various tools for ocaml programmers:
- ocamlmakefile: a makefile template
- a configure.in and Makefile.in template
- ocamldot: generate program dependency graphs for ocaml programs
-
+ - omlet: a better ocaml indentation mode for vim
Modified: packages/ocaml-tools/trunk/debian/copyright
===================================================================
--- packages/ocaml-tools/trunk/debian/copyright 2005-02-25 15:02:30 UTC (rev 990)
+++ packages/ocaml-tools/trunk/debian/copyright 2005-03-02 11:39:07 UTC (rev 991)
@@ -38,3 +38,20 @@
Ocamldot was written by Trevor Jim. It is in the public domain; use
it however you like, at your own risk.
+
+
+omlet
+-----
+Downloaded from http://www.vim.org/scripts/script.php?script_id=1196
+
+Upstream Author: David Baelde <david.baelde@ens-lyon.org>
+
+Copyright (C) 2005 David Baelde
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+On Debian systems you can find a copy of this license in
+/usr/share/common-licenses/GPL.
Modified: packages/ocaml-tools/trunk/debian/dirs
===================================================================
--- packages/ocaml-tools/trunk/debian/dirs 2005-02-25 15:02:30 UTC (rev 990)
+++ packages/ocaml-tools/trunk/debian/dirs 2005-03-02 11:39:07 UTC (rev 991)
@@ -4,5 +4,7 @@
usr/share/ocaml-tools
usr/share/man/man1
usr/share/lintian/overrides
-
-
+usr/share/vim/addons/ftdetect
+usr/share/vim/addons/ftplugin
+usr/share/vim/addons/indent
+usr/share/vim/addons/syntax
Added: packages/ocaml-tools/trunk/debian/lintian-overrides
===================================================================
--- packages/ocaml-tools/trunk/debian/lintian-overrides 2005-02-25 15:02:30 UTC (rev 990)
+++ packages/ocaml-tools/trunk/debian/lintian-overrides 2005-03-02 11:39:07 UTC (rev 991)
@@ -0,0 +1 @@
+ocaml-tools: wrong-name-for-upstream-changelog usr/share/doc/ocaml-tools/changelog.ocamlmake.gz
Modified: packages/ocaml-tools/trunk/debian/rules
===================================================================
--- packages/ocaml-tools/trunk/debian/rules 2005-02-25 15:02:30 UTC (rev 990)
+++ packages/ocaml-tools/trunk/debian/rules 2005-03-02 11:39:07 UTC (rev 991)
@@ -12,6 +12,9 @@
# ocamlmake source dir
export OMAKESRC := $(shell echo ocaml-make-*)
+# omlet source dir
+OMLETSRC = $(shell echo omlet-*)
+
include /usr/share/dpatch/dpatch.make
build: ocamldot/ocamldot
@@ -32,10 +35,12 @@
dh_clean -k
dh_installdirs
+ # ocamldot
cp ocamldot/ocamldot debian/ocaml-tools/usr/bin
cp ocamldot/README $(DOCDIR)/README.ocamldot
cp ocamldot/ocamldot.1 debian/ocaml-tools/usr/share/man/man1
+ # ocaml-make
cp $(OMAKESRC)/Changes $(DOCDIR)/changelog.ocamlmake
cp $(OMAKESRC)/README $(DOCDIR)/README.ocamlmake
for f in calc camlp4 idl gtk threads; do\
@@ -49,8 +54,14 @@
sed "s|/usr/local/lib|/usr/lib|" < $(OMAKESRC)/OCamlMakefile\
> $(SHDIR)/OCamlMakefile
+ # autoconf
cp autoconf/configure.in $(SHDIR)
cp autoconf/Makefile.in $(SHDIR)
+
+ # omlet
+ BASE=$(CURDIR)/debian/ocaml-tools/usr/share/vim/addons make -C $(OMLETSRC) install-aux
+ cp $(OMLETSRC)/README $(DOCDIR)/README.omlet
+
cp debian/lintian-overrides \
debian/ocaml-tools/usr/share/lintian/overrides/ocaml-tools
Deleted: packages/ocaml-tools/trunk/ocaml-tools_2004.08.22.orig.tar.gz
===================================================================
(Binary files differ)
Added: packages/ocaml-tools/trunk/ocaml-tools_2005.03.02.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: packages/ocaml-tools/trunk/ocaml-tools_2005.03.02.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream