[Pkg-ocaml-maint-commits] r1391 - in trunk/packages/tuareg-mode/trunk/debian: . patches

Ralf Treinen treinen@costa.debian.org
Wed, 01 Jun 2005 20:07:27 +0000


Author: treinen
Date: 2005-06-01 20:07:27 +0000 (Wed, 01 Jun 2005)
New Revision: 1391

Added:
   trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch
Modified:
   trunk/packages/tuareg-mode/trunk/debian/changelog
   trunk/packages/tuareg-mode/trunk/debian/patches/00list
Log:
New patch charsetp


Modified: trunk/packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/changelog	2005-05-29 19:21:09 UTC (rev 1390)
+++ trunk/packages/tuareg-mode/trunk/debian/changelog	2005-06-01 20:07:27 UTC (rev 1391)
@@ -1,8 +1,10 @@
-tuareg-mode (1.45.0-beta1-2) UNRELEASED; urgency=low
+tuareg-mode (1.45.0-beta1-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Patch 04_charsetp: Fixes compilation error under xemacs21-nomule due
+    to unbound symbol charsetp. Thanks to Meik Hellmund for the patch.
+    (closes: Bug#311274).
 
- -- Ralf Treinen <treinen@debian.org>  Sun, 29 May 2005 20:23:04 +0200
+ -- Ralf Treinen <treinen@debian.org>  Wed,  1 Jun 2005 22:05:47 +0200
 
 tuareg-mode (1.45.0-beta1-1) unstable; urgency=low
 

Modified: trunk/packages/tuareg-mode/trunk/debian/patches/00list
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-05-29 19:21:09 UTC (rev 1390)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-06-01 20:07:27 UTC (rev 1391)
@@ -1,3 +1,4 @@
 01_camldebug
 02_localdoc
 03_fontlock
+04_charsetp
\ No newline at end of file

Added: trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch	2005-05-29 19:21:09 UTC (rev 1390)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch	2005-06-01 20:07:27 UTC (rev 1391)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_charsetp.dpatch by Ralf Treinen <treinen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid compilation error due to unbound symbol charsetp
+## DP: with xemacs21-nomule (thanks to Meik Hellmund for the patch).
+
+@DPATCH@
+--- tuareg.el.orig
++++ tuareg.el
+@@ -711,7 +711,7 @@
+ (defvar tuareg-font-lock-symbols-alist
+   (append
+    ;; The symbols can come from a JIS0208 font.
+-   (and (fboundp 'make-char) (charsetp 'japanese-jisx0208)
++   (and (fboundp 'make-char) (fboundp 'charsetp) (charsetp 'japanese-jisx0208)
+        (list (cons "fun" (make-char 'japanese-jisx0208 38 75))
+              (cons "sqrt" (make-char 'japanese-jisx0208 34 101))
+              (cons "not" (make-char 'japanese-jisx0208 34 76))
+


Property changes on: trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch
___________________________________________________________________
Name: svn:executable
   + *