[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-4-12-gf60911f

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 83127da63e0a0ef3f590a809209a1b79b44c2dc5
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Jun 6 21:51:56 2012 +0200

    do not activate SMIE indentation by default.

diff --git a/debian/NEWS b/debian/NEWS
index 056e40b..edc4f71 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,15 @@
+tuareg-mode (1:2.0.6-1) unstable; urgency=low
+
+  This version of tuareg-mode contains a new SMIE indentation engine.
+  Using this new feature is enabled by executing in emacs
+  
+    (setq tuareg-use-smie t)
+  
+  This is currently not done by default due to a bug in that
+  indentation engine that in some cases may lead to an infinite loop.
+  
+ -- Ralf Treinen <treinen at debian.org>  Wed, 06 Jun 2012 21:47:22 +0200
+
 tuareg-mode (1.45.2-1) unstable; urgency=low
 
   The emacs mode tuareg-mode is now automatically loaded on all files with
diff --git a/debian/changelog b/debian/changelog
index 89316c2..8282d20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 tuareg-mode (1:2.0.6-1) unstable; urgency=low
 
-  * New upstream version. This version contains a new identation engine
-    which fixes some indentation problems (closes: #617407)
+  * New upstream version. 
   * debian/watch: also accept .tar.gz files
   * upstream does noy longer distribute append-tuareg.el. Put our own version.
     Drop patches to append-tuareg.el that are hence no longer necessary:
@@ -13,11 +12,10 @@ tuareg-mode (1:2.0.6-1) unstable; urgency=low
     debian ocaml policy.
   * debian/rules: no more files custom-tuareg.el or sym-lock.el to install
   * installation: do not compile for xemacs.
-  * debian/emacsen-startup: activate SMIE indentation engine
   * debian/emacsen-install: create in ELC directory symbolic links for the
     corresponding .el files (closes: #671573)
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 05 Jun 2012 23:09:00 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 06 Jun 2012 21:47:22 +0200
 
 tuareg-mode (1:2.0.4-4) unstable; urgency=low
 
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
index 55c4e4c..a085805 100644
--- a/debian/emacsen-startup
+++ b/debian/emacsen-startup
@@ -7,7 +7,8 @@
  (concat "/usr/share/"
 	 (symbol-name debian-emacs-flavor)
 	 "/site-lisp/tuareg-mode"))
-(setq tuareg-use-smie t)
+;; SMIE turned off due to upstream bug #1167
+(setq tuareg-use-smie f)
 
 
 

-- 
tuareg-mode packaging