[Pkg-ocaml-maint-commits] r1338 - in trunk/packages/ocaml-tools/trunk: . debian debian/po
Samuel Mimram
smimram-guest@costa.debian.org
Fri, 29 Apr 2005 15:28:48 +0000
Author: smimram-guest
Date: 2005-04-29 15:28:45 +0000 (Fri, 29 Apr 2005)
New Revision: 1338
Added:
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
trunk/packages/ocaml-tools/trunk/debian/po/
trunk/packages/ocaml-tools/trunk/debian/po/POTFILES.in
trunk/packages/ocaml-tools/trunk/debian/po/templates.pot
trunk/packages/ocaml-tools/trunk/ocaml-tools_2005.29.04.orig.tar.gz
Removed:
trunk/packages/ocaml-tools/trunk/ocaml-tools_2005.25.03.orig.tar.gz
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/rules
Log:
New upstream releases + omlet is not used by default anymore.
Modified: trunk/packages/ocaml-tools/trunk/debian/README.Debian
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/README.Debian 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/README.Debian 2005-04-29 15:28:45 UTC (rev 1338)
@@ -1,6 +1,13 @@
-omlet
+Omlet
-----
-To have vim loading automatically the omlet mode on ml and mli files, add the
-following line to your ~/.vimrc file:
+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:
-filetype plugin indent on
+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
Modified: trunk/packages/ocaml-tools/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/changelog 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/changelog 2005-04-29 15:28:45 UTC (rev 1338)
@@ -1,3 +1,12 @@
+ocaml-tools (2005.29.04-1) unstable; urgency=low
+
+ * New upstream release of OCamlMakefile (6.20.0).
+ * New upstream release of omlet (0.13).
+ * Not using omlet by default anymore, added a debconf question for that and
+ a note in the README.Debian, closes: #304883.
+
+ -- Samuel Mimram <smimram@debian.org> Fri, 29 Apr 2005 13:54:37 +0200
+
ocaml-tools (2005.25.03-1) unstable; urgency=low
* New upstream release of omlet (0.12).
Modified: trunk/packages/ocaml-tools/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/control 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/control 2005-04-29 15:28:45 UTC (rev 1338)
@@ -8,7 +8,7 @@
Package: ocaml-tools
Architecture: all
-Depends: ocaml-base-nox-3.08.3
+Depends: ocaml-base-nox-3.08.3, debconf
Enhances: ocaml
Suggests: autoconf, graphviz, vim, otags
Description: various tools for ocaml programmers
Modified: trunk/packages/ocaml-tools/trunk/debian/dirs
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/dirs 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/dirs 2005-04-29 15:28:45 UTC (rev 1338)
@@ -2,9 +2,6 @@
usr/share/doc/ocaml-tools/examples.ocamlmake
usr/bin
usr/share/ocaml-tools
+usr/share/ocaml-tools/omlet
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: trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.config
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.config 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.config 2005-04-29 15:28:45 UTC (rev 1338)
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+action=$1
+version=$2
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+db_input medium ocaml-tools/use_omlet || true
+db_go
+
+exit 0
Added: trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.postinst
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.postinst 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.postinst 2005-04-29 15:28:45 UTC (rev 1338)
@@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+. /usr/share/debconf/confmodule
+db_get ocaml-tools/use_omlet
+if [ "$RET" = true ]; then
+ 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
+fi
+
+#DEBHELPER#
Added: trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.prerm
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.prerm 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.prerm 2005-04-29 15:28:45 UTC (rev 1338)
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+for i in `cd /usr/share/ocaml-tools/omlet/; ls`; do
+ if [ -h /usr/share/vim/addons/$i/omlet.vim ]; then
+ rm /usr/share/vim/addons/$i/omlet.vim
+ fi
+done
+
+
+#DEBHELPER#
Added: trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.templates
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.templates 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/ocaml-tools.templates 2005-04-29 15:28:45 UTC (rev 1338)
@@ -0,0 +1,8 @@
+Template: ocaml-tools/use_omlet
+Type: boolean
+Default: false
+_Description: Do you want to use omlet as default vim mode?
+ Omlet is an enhanced vim mode for OCaml which has better indentation than the
+ official vim mode for OCaml. You don't need this if you don't use vim.
+ .
+ Do you want to use it as the default mode for editing ml files?
Added: trunk/packages/ocaml-tools/trunk/debian/po/POTFILES.in
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/po/POTFILES.in 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/po/POTFILES.in 2005-04-29 15:28:45 UTC (rev 1338)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] ocaml-tools.templates
Added: trunk/packages/ocaml-tools/trunk/debian/po/templates.pot
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/po/templates.pot 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/po/templates.pot 2005-04-29 15:28:45 UTC (rev 1338)
@@ -0,0 +1,45 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-04-29 17:18+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../ocaml-tools.templates:4
+msgid "Do you want to use omlet as default vim mode?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ocaml-tools.templates:4
+msgid ""
+"Omlet is an enhanced vim mode for OCaml which has better indentation than "
+"the official vim mode for OCaml. You don't need this if you don't use vim."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ocaml-tools.templates:4
+msgid "Do you want to use it as the default mode for editing ml files?"
+msgstr ""
Modified: trunk/packages/ocaml-tools/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-tools/trunk/debian/rules 2005-04-29 09:44:32 UTC (rev 1337)
+++ trunk/packages/ocaml-tools/trunk/debian/rules 2005-04-29 15:28:45 UTC (rev 1338)
@@ -21,7 +21,7 @@
ocamldot/ocamldot: patch
dh_testdir
- (cd ocamldot; make)
+ (cd ocamldot; make)
clean: unpatch
dh_testdir
@@ -59,7 +59,8 @@
cp autoconf/Makefile.in $(SHDIR)
# omlet
- BASE=$(CURDIR)/debian/ocaml-tools/usr/share/vim/addons make -C $(OMLETSRC) install-aux
+ #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
@@ -72,7 +73,8 @@
dh_testdir
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs
+ dh_installdebconf
dh_link
dh_compress
dh_fixperms
Deleted: trunk/packages/ocaml-tools/trunk/ocaml-tools_2005.25.03.orig.tar.gz
===================================================================
(Binary files differ)
Added: trunk/packages/ocaml-tools/trunk/ocaml-tools_2005.29.04.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/ocaml-tools/trunk/ocaml-tools_2005.29.04.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream