[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/2.0.1-1

[Ralf Treinen]

The following commit has been merged in the master branch:
commit e971913fd1ac0c14b0211004c1e7094e87d1aa03
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu May 27 07:47:03 2010 +0200

    adapt patches to new upstream

diff --git a/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch b/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
index 4bcb8b0..6c2171c 100644
--- a/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
+++ b/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
@@ -6,14 +6,15 @@ Subject: [PATCH] camldebug of tuareg-mode is renamed to camldebug-tuareg
  append-tuareg.el |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/append-tuareg.el b/append-tuareg.el
-index 596ce4b..51951f8 100644
---- a/append-tuareg.el
-+++ b/append-tuareg.el
-@@ -3,4 +3,4 @@
+Index: tuareg-mode/append-tuareg.el
+===================================================================
+--- tuareg-mode.orig/append-tuareg.el	2010-05-27 07:42:38.000000000 +0200
++++ tuareg-mode/append-tuareg.el	2010-05-27 07:43:37.000000000 +0200
+@@ -3,6 +3,6 @@
  
  (add-to-list 'auto-mode-alist '("\\.ml\\w?" . tuareg-mode))
  (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
 -(autoload 'camldebug "camldebug" "Run the Caml debugger" t)
 +(autoload 'camldebug "camldebug-tuareg" "Run the Caml debugger" t)
--- 
+ (dolist (ext '(".cmo" ".cmx" ".cma" ".cmxa" ".cmi"))
+   (add-to-list 'completion-ignored-extensions ext))
diff --git a/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch b/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
index 015609d..8737777 100644
--- a/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
+++ b/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] Use locally installed documentation when possible
  tuareg.el |    8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/tuareg.el b/tuareg.el
-index f614ea0..bf11e54 100644
---- a/tuareg.el
-+++ b/tuareg.el
-@@ -368,7 +368,11 @@ them to the Caml toplevel."
+Index: tuareg-mode/tuareg.el
+===================================================================
+--- tuareg-mode.orig/tuareg.el	2010-05-27 07:35:49.000000000 +0200
++++ tuareg-mode/tuareg.el	2010-05-27 07:44:21.000000000 +0200
+@@ -364,7 +364,11 @@
    "*Non nil means pop up the Caml toplevel when evaluating code."
    :group 'tuareg :type 'boolean)
  
@@ -23,7 +23,7 @@ index f614ea0..bf11e54 100644
    "*URL to the Caml reference manual."
    :group 'tuareg :type 'string)
  
-@@ -377,7 +381,7 @@ them to the Caml toplevel."
+@@ -373,7 +377,7 @@
  Valid names are `browse-url', `browse-url-firefox', etc."
    :group 'tuareg)
  
@@ -32,4 +32,3 @@ index f614ea0..bf11e54 100644
    "*Path to the Caml library."
    :group 'tuareg :type 'string)
  
--- 
diff --git a/debian/patches/0003-Narrow-autoload-pattern-down-to-what-is-really-neede.patch b/debian/patches/0003-Narrow-autoload-pattern-down-to-what-is-really-neede.patch
index 3fb28b7..bfd73ee 100644
--- a/debian/patches/0003-Narrow-autoload-pattern-down-to-what-is-really-neede.patch
+++ b/debian/patches/0003-Narrow-autoload-pattern-down-to-what-is-really-neede.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] Narrow autoload pattern down to what is really needed
  append-tuareg.el |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/append-tuareg.el b/append-tuareg.el
-index 51951f8..dd3c321 100644
---- a/append-tuareg.el
-+++ b/append-tuareg.el
-@@ -1,6 +1,6 @@
+Index: tuareg-mode/append-tuareg.el
+===================================================================
+--- tuareg-mode.orig/append-tuareg.el	2010-05-27 07:46:02.000000000 +0200
++++ tuareg-mode/append-tuareg.el	2010-05-27 07:46:02.000000000 +0200
+@@ -1,7 +1,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
  
@@ -18,4 +18,4 @@ index 51951f8..dd3c321 100644
 +(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"))

-- 
tuareg-mode packaging