[Pkg-ocaml-maint-commits] r1620 - trunk/packages/tuareg-mode/trunk/debian

[Ralf Treinen]

Author: treinen
Date: 2005-08-21 15:31:33 +0000 (Sun, 21 Aug 2005)
New Revision: 1620

Modified:
   trunk/packages/tuareg-mode/trunk/debian/NEWS
   trunk/packages/tuareg-mode/trunk/debian/README.Debian
   trunk/packages/tuareg-mode/trunk/debian/changelog
   trunk/packages/tuareg-mode/trunk/debian/control
   trunk/packages/tuareg-mode/trunk/debian/rules
Log:
tuareg 1.45.0-final with autoload


Modified: trunk/packages/tuareg-mode/trunk/debian/NEWS
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/NEWS	2005-08-20 13:20:59 UTC (rev 1619)
+++ trunk/packages/tuareg-mode/trunk/debian/NEWS	2005-08-21 15:31:33 UTC (rev 1620)
@@ -1,3 +1,12 @@
+tuareg-mode (1.45.0-final-1) unstable; urgency=low
+  
+  * The emacs mode tuareg-mode is now autoloaded by default on files with
+    file name extension ".ml\w?". Users have no longer to include the file
+    "append-tuareg" in their .emacs files. The file "append-tuareg" is now
+    an empty dummy file such that existing user .emacs files won't break.
+  
+ -- Ralf Treinen <treinen at debian.org>  Sat, 20 Aug 2005 22:35:45 +0200
+
 tuareg-mode (1.40.5.1-1) unstable; urgency=low
 
   * New function called tuareg-narrow-to-phrase, bound to C-xnd (normally

Modified: trunk/packages/tuareg-mode/trunk/debian/README.Debian
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/README.Debian	2005-08-20 13:20:59 UTC (rev 1619)
+++ trunk/packages/tuareg-mode/trunk/debian/README.Debian	2005-08-21 15:31:33 UTC (rev 1620)
@@ -1,11 +1,11 @@
 tuareg-mode for Debian
 ----------------------
 
-The tuareg emacs mode is not loaded by default. To activate automagically
-tuareg mode on ocaml files the user should include the following line in
-his .emacs:
+tuareg-mode is now automatically loaded on all files with filename
+extension .ml\w?. If the debian package "ocaml-mode", which provides
+an alternative emacs mode for (O)Caml files, is installed together
+with the tuareg-mode package then tuareg takes precedence.  Users who
+wish to overwrite this behaviour should consult the instuctions given
+in the file /usr/share/doc/ocaml-mode/README.Debian.
 
-	(load "append-tuareg")
-
-
- -- Ralf Treinen <treinen at debian.org>, Sat, 24 Mar 2001 18:49:15 +0100
+ -- Ralf Treinen <treinen at debian.org>, Sat Aug 20 22:49:45 2005

Modified: trunk/packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/changelog	2005-08-20 13:20:59 UTC (rev 1619)
+++ trunk/packages/tuareg-mode/trunk/debian/changelog	2005-08-21 15:31:33 UTC (rev 1620)
@@ -1,8 +1,11 @@
-tuareg-mode (1.45.0-final-1) NOT_YET_RELASED; urgency=low
+tuareg-mode (1.45.0-final-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release.
+  * Install an emacs startup file with priority 51, and replace the installed 
+    append-tuareg.el file by an empty file. Adapt NEWS.Debian accordingly.
+  * Some improvements in long package description.
 
- -- Ralf Treinen <treinen at debian.org>  Sat, 20 Aug 2005 13:51:26 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sat, 20 Aug 2005 22:50:11 +0200
 
 tuareg-mode (1.45.0-beta3-1) unstable; urgency=low
 

Modified: trunk/packages/tuareg-mode/trunk/debian/control
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/control	2005-08-20 13:20:59 UTC (rev 1619)
+++ trunk/packages/tuareg-mode/trunk/debian/control	2005-08-21 15:31:33 UTC (rev 1620)
@@ -13,11 +13,12 @@
 Enhances: ocaml
 Conflicts: ocaml-tools (<= 1.1-2)
 Description: An emacs-mode for ocaml programs
- Handles automatic indentation of Objective Caml and Caml-Light codes.
- Key parts of the code are highlighted using Font-Lock. Support to run
- an interactive Caml toplevel and debugger is provided. Works both
- with FSF Emacs and XEmacs.
+ It handles automatic indentation of Objective Caml and Caml-Light
+ code.  Key parts of the code are highlighted using Font-Lock. It
+ provides support to run an interactive OCaml toplevel and debugger.
+ It works both with FSF Emacs and XEmacs.
  .
  This mode attempts to give better results than the one provided in
- the standard distribution OCaml 3.x. Indentation rules are slightly
- different but closer to classical functional languages indentation.
+ the standard distribution of OCaml and which is available through the
+ ocaml-mode package. Indentation rules are slightly different but
+ closer to classical functional languages indentation.

Modified: trunk/packages/tuareg-mode/trunk/debian/rules
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/rules	2005-08-20 13:20:59 UTC (rev 1619)
+++ trunk/packages/tuareg-mode/trunk/debian/rules	2005-08-21 15:31:33 UTC (rev 1620)
@@ -21,7 +21,9 @@
 	dh_testroot
 	dh_clean -k
 	mkdir -p $(TUAREGXELDIR) $(TUAREGELDIR)
-	cp tuareg.el append-tuareg.el custom-tuareg.el $(TUAREGELDIR)
+	cp tuareg.el custom-tuareg.el $(TUAREGELDIR)
+	cp append-tuareg.el debian/tuareg-mode.emacsen-startup
+	echo ";; empty dummy file" > $(TUAREGELDIR)/append-tuareg.el
 	cp sym-lock.el $(TUAREGXELDIR)
 	cp camldebug.el $(TUAREGELDIR)/camldebug-tuareg.el
 
@@ -31,7 +33,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs HISTORY README LISEZMOI
-	dh_installemacsen
+	dh_installemacsen --priority=51
 	dh_installchangelogs 
 	dh_link
 	dh_compress