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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit fd7a2d13d333dbe8e953c4cd51bf6fcccd6736ae
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Jun 12 21:09:47 2012 +0200

    emacs21 compatibility: add (required 'derived)

diff --git a/debian/changelog b/debian/changelog
index b229837..a3ff783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ tuareg-mode (1:2.0.6-2) UNRELEASED; urgency=low
   * debian/emacsen-install: fix tuareg-use-smie (f -> nil). Thanks to
     Kevin Ryde (closes: #676860).
   * debian control: first choice of emacsen is emacs23, not xemacs21
+  * new patch emacs21: add an (required 'derived) in case it is not loaded,
+    needed by emacs21. Thanks to Kevin Ryde for the patch (closes: #676858).
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 10 Jun 2012 19:01:00 +0200
+ -- Ralf Treinen <treinen at debian.org>  Tue, 12 Jun 2012 21:08:56 +0200
 
 tuareg-mode (1:2.0.6-1) unstable; urgency=low
 
diff --git a/debian/patches/emacs21 b/debian/patches/emacs21
new file mode 100644
index 0000000..9614969
--- /dev/null
+++ b/debian/patches/emacs21
@@ -0,0 +1,23 @@
+Author: Kevin Ryde <user42 at zip.com.au>
+Integrated: Ralf Treinen <treinen at debian.org>
+Debian-bug: #676858
+Description: emacs21 needs an (required 'derived)
+Forwarded: https://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1172&group_id=43&atid=257
+
+Index: tuareg-mode/tuareg.el
+===================================================================
+--- tuareg-mode.orig/tuareg.el	2012-06-12 21:05:00.000000000 +0200
++++ tuareg-mode/tuareg.el	2012-06-12 21:06:12.000000000 +0200
+@@ -134,6 +134,12 @@
+                             (or history 'shell-command-history))))
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++;;      Compatibility with emacs21
++
++(unless (fboundp 'derived-mode-p) ;; in derived.el in emacs21
++  (require 'derived))
++
++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;                             Import types and help features
+ 
+ (defvar tuareg-with-caml-mode-p
diff --git a/debian/patches/series b/debian/patches/series
index 93fb398..568d3a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ocaml-path
+emacs21

-- 
tuareg-mode packaging