[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-3-6-ge8d7973

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 2a6eecd46bddf8313d1c2ff3f775a638c533de0f
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun May 6 15:01:49 2012 +0200

    autoload regexp must apply only at the end of filename

diff --git a/debian/changelog b/debian/changelog
index ea4bf13..656ffe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,14 +2,14 @@ tuareg-mode (1:2.0.4-4) unstable; urgency=low
 
   * Bring files tuareg.el and append-tuareg.el to upstream version 2.0.4.
     These two files were left in version 2.0.1 due to an accident.
-    This brings also back upstream's fix of the filename pattern in
-    append-tuareg.el (closes: #671558).
+  * Patch 0003-narrow-down-auto-alist: regexp must apply only at the end
+    of a filename. Thanks to Kevin Ryde for the patch (closes: #671558).
   * debian/control: drop starting article in short description
   * standards-version 3.9.3
     - debian/copyright: migrate to machine-readable format 1.0
   * debian/emacsen-setloadpath: use debian-pkg-add-load-path-item, instead
     of explicit setting of the load-path variable, to extend the load path
-    (closes: # 671557).
+    (closes: #671557).
 
  -- Ralf Treinen <treinen at debian.org>  Sun, 06 May 2012 14:45:23 +0200
 
diff --git a/debian/patches/0003-narrow-down-auto-alist b/debian/patches/0003-narrow-down-auto-alist
new file mode 100644
index 0000000..535bfc2
--- /dev/null
+++ b/debian/patches/0003-narrow-down-auto-alist
@@ -0,0 +1,17 @@
+Author: Kevin Ryde <user42 at zip.com.au>
+Description: narrow down auto-alist to match only at the end of a filename
+Debian-bug: #671558
+
+Index: tuareg-mode/append-tuareg.el
+===================================================================
+--- tuareg-mode.orig/append-tuareg.el	2012-05-06 14:55:03.000000000 +0200
++++ tuareg-mode/append-tuareg.el	2012-05-06 14:56:37.000000000 +0200
+@@ -1,7 +1,7 @@
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
+ 
+-(add-to-list 'auto-mode-alist '("\\.ml[iylp]?" . tuareg-mode))
++(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . tuareg-mode))
+ (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
+ (autoload 'camldebug "camldebug-tuareg" "Run the Caml debugger" t)
+ (dolist (ext '(".cmo" ".cmx" ".cma" ".cmxa" ".cmi"))
diff --git a/debian/patches/series b/debian/patches/series
index 4f75233..3ffc710 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
 0002-Use-locally-installed-documentation-when-possible.patch
+0003-narrow-down-auto-alist

-- 
tuareg-mode packaging