[Pkg-ocaml-maint-commits] [tuareg-mode] 06/06: drop patch emacs21

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository tuareg-mode.

commit 65a6c2a7a1bce98227b59fb29af8c6195e42c96b
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Jul 7 09:03:08 2014 +0200

    drop patch emacs21
---
 debian/changelog       |  6 ++++--
 debian/patches/emacs21 | 23 -----------------------
 debian/patches/series  |  1 -
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f9b9e2..fe7f304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tuareg-mode (1:2.0.6-4) UNRELEASED; urgency=low
+tuareg-mode (1:2.0.7-1) UNRELEASED; urgency=low
 
   [ Sylvain Le Gall]
   * Remove Sylvain Le Gall from uploaders
@@ -8,8 +8,10 @@ tuareg-mode (1:2.0.6-4) UNRELEASED; urgency=low
   * Standards-Version 3.9.5 (no change)
   * Drop conflict with ocaml-tools (<=1.1-2) which is no longer distributed
     since october 2001.
+  * Drop patch emacs21 which is no longer relevant - we don't care for
+    compatibility with emacs version 21 any more.
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 07 Jul 2014 08:43:09 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 07 Jul 2014 09:02:54 +0200
 
 tuareg-mode (1:2.0.6-3) unstable; urgency=low
 
diff --git a/debian/patches/emacs21 b/debian/patches/emacs21
deleted file mode 100644
index 9614969..0000000
--- a/debian/patches/emacs21
+++ /dev/null
@@ -1,23 +0,0 @@
-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 568d3a3..93fb398 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 ocaml-path
-emacs21

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/tuareg-mode.git