[Pkg-ocaml-maint-commits] r1115 - in packages/ocaml-tools/trunk: . debian debian/patches

[Samuel Mimram]

Author: smimram-guest
Date: 2005-03-25 17:48:18 +0000 (Fri, 25 Mar 2005)
New Revision: 1115

Added:
   packages/ocaml-tools/trunk/debian/patches/omlet_override.dpatch
   packages/ocaml-tools/trunk/ocaml-tools_2005.25.03.orig.tar.gz
Removed:
   packages/ocaml-tools/trunk/ocaml-tools_2005.03.02.orig.tar.gz
Modified:
   packages/ocaml-tools/trunk/debian/changelog
   packages/ocaml-tools/trunk/debian/patches/00list
   packages/ocaml-tools/trunk/debian/rules
Log:
New upstream release of omlet.

Modified: packages/ocaml-tools/trunk/debian/changelog
===================================================================
--- packages/ocaml-tools/trunk/debian/changelog	2005-03-25 14:34:05 UTC (rev 1114)
+++ packages/ocaml-tools/trunk/debian/changelog	2005-03-25 17:48:18 UTC (rev 1115)
@@ -1,3 +1,9 @@
+ocaml-tools (2005.25.03-1) unstable; urgency=low
+
+  * New upstream release of omlet.
+
+ -- Samuel Mimram <smimram@debian.org>  Fri, 25 Mar 2005 17:45:43 +0100
+
 ocaml-tools (2005.03.02-2) unstable; urgency=medium
 
   * Updated to OCaml 3.08.3.

Modified: packages/ocaml-tools/trunk/debian/patches/00list
===================================================================
--- packages/ocaml-tools/trunk/debian/patches/00list	2005-03-25 14:34:05 UTC (rev 1114)
+++ packages/ocaml-tools/trunk/debian/patches/00list	2005-03-25 17:48:18 UTC (rev 1115)
@@ -1 +1,2 @@
 01_ocamldot-manpage
+omlet_override

Added: packages/ocaml-tools/trunk/debian/patches/omlet_override.dpatch
===================================================================
--- packages/ocaml-tools/trunk/debian/patches/omlet_override.dpatch	2005-03-25 14:34:05 UTC (rev 1114)
+++ packages/ocaml-tools/trunk/debian/patches/omlet_override.dpatch	2005-03-25 17:48:18 UTC (rev 1115)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## omlet_override.dpatch by Samuel Mimram <smimram@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Override the default OCaml plugin.
+
+@DPATCH@
+diff -urNad ocaml-tools-2005.25.03/omlet-0.13/ftplugin/omlet.vim /tmp/dpep.nMNNb8/ocaml-tools-2005.25.03/omlet-0.13/ftplugin/omlet.vim
+--- ocaml-tools-2005.25.03/omlet-0.13/ftplugin/omlet.vim	2005-03-25 16:10:56.000000000 +0100
++++ /tmp/dpep.nMNNb8/ocaml-tools-2005.25.03/omlet-0.13/ftplugin/omlet.vim	2005-03-25 18:45:00.000000000 +0100
+@@ -35,9 +35,6 @@
+ " Folding is activated if ocaml_folding is set
+ " Do these settings once per buffer
+ 
+-if exists("b:did_ftplugin") && !exists("g:did_ocaml_switch")
+-  finish
+-endif
+ let b:did_ftplugin=1
+ 
+ " Error handling -- helps moving where the compiler wants you to go


Property changes on: packages/ocaml-tools/trunk/debian/patches/omlet_override.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/ocaml-tools/trunk/debian/rules
===================================================================
--- packages/ocaml-tools/trunk/debian/rules	2005-03-25 14:34:05 UTC (rev 1114)
+++ packages/ocaml-tools/trunk/debian/rules	2005-03-25 17:48:18 UTC (rev 1115)
@@ -61,6 +61,7 @@
 	# omlet
 	BASE=$(CURDIR)/debian/ocaml-tools/usr/share/vim/addons make -C $(OMLETSRC) install-aux
 	cp $(OMLETSRC)/README $(DOCDIR)/README.omlet
+	cp $(OMLETSRC)/ChangeLog $(DOCDIR)/changelog.omlet
 
 	cp debian/lintian-overrides \
 		debian/ocaml-tools/usr/share/lintian/overrides/ocaml-tools

Deleted: packages/ocaml-tools/trunk/ocaml-tools_2005.03.02.orig.tar.gz
===================================================================
(Binary files differ)

Added: packages/ocaml-tools/trunk/ocaml-tools_2005.25.03.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: packages/ocaml-tools/trunk/ocaml-tools_2005.25.03.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream