[Pkg-ocaml-maint-commits] r1401 - in trunk/packages/tuareg-mode: trunk/debian trunk/debian/patches upstream
Ralf Treinen
treinen@costa.debian.org
Tue, 07 Jun 2005 19:03:04 +0000
Author: treinen
Date: 2005-06-07 19:03:02 +0000 (Tue, 07 Jun 2005)
New Revision: 1401
Added:
trunk/packages/tuareg-mode/trunk/debian/patches/03_keyword-face.dpatch
trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.0-beta2.orig.tar.gz
Removed:
trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch
trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch
Modified:
trunk/packages/tuareg-mode/trunk/debian/changelog
trunk/packages/tuareg-mode/trunk/debian/control
trunk/packages/tuareg-mode/trunk/debian/patches/00list
trunk/packages/tuareg-mode/trunk/debian/svn-deblayout
Log:
tuareg-mode 1.45-beta2-1
Modified: trunk/packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/changelog 2005-06-05 17:38:30 UTC (rev 1400)
+++ trunk/packages/tuareg-mode/trunk/debian/changelog 2005-06-07 19:03:02 UTC (rev 1401)
@@ -1,3 +1,14 @@
+tuareg-mode (1.45.0-beta2-1) unstable; urgency=low
+
+ * New upstream version (called 1.45.0-rc2 by upstream).
+ * Removed patches 03_fontlock and 04_charsetp since now fixed by
+ upstream.
+ * Patch 03_keyword-face: Fix bug on keyword coloration - thanks to Remi
+ Vanicat for the patch (closes: #312212).
+ * Added new uploader Samuel Mimram.
+
+ -- Ralf Treinen <treinen@debian.org> Tue, 7 Jun 2005 21:00:43 +0200
+
tuareg-mode (1.45.0-beta1-2) unstable; urgency=low
* Patch 04_charsetp: Fixes compilation error under xemacs21-nomule due
Modified: trunk/packages/tuareg-mode/trunk/debian/control
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/control 2005-06-05 17:38:30 UTC (rev 1400)
+++ trunk/packages/tuareg-mode/trunk/debian/control 2005-06-07 19:03:02 UTC (rev 1401)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
-Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>
+Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>, Samuel Mimram <smimram@debian.org>
Build-Depends-Indep: debhelper (>= 4.0), dpatch
Standards-Version: 3.6.1
Modified: trunk/packages/tuareg-mode/trunk/debian/patches/00list
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/00list 2005-06-05 17:38:30 UTC (rev 1400)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/00list 2005-06-07 19:03:02 UTC (rev 1401)
@@ -1,4 +1,4 @@
01_camldebug
02_localdoc
-03_fontlock
-04_charsetp
+03_keyword-face
+
Deleted: trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch 2005-06-05 17:38:30 UTC (rev 1400)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch 2005-06-07 19:03:02 UTC (rev 1401)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fontlock.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid compilation error of camldebug when font-lock is not
-## DP: loaded (thanks to Jérôme Marant and Remi Vanicat for their help)
-
-@DPATCH@
-diff -urNad tuareg-mode-1.45.0/tuareg.el /tmp/dpep.WHLiht/tuareg-mode-1.45.0/tuareg.el
---- tuareg-mode-1.45.0/tuareg.el 2005-02-24 15:34:45.000000000 +0100
-+++ /tmp/dpep.WHLiht/tuareg-mode-1.45.0/tuareg.el 2005-05-29 20:02:26.000000000 +0200
-@@ -867,13 +867,15 @@
- font-lock-comment-face))))
-
- (defvar font-lock-constant-face)
--(if (facep 'font-lock-constant-face) ()
-- (defvar font-lock-constant-face font-lock-reference-face)
-- (copy-face font-lock-reference-face 'font-lock-constant-face))
--(defvar font-lock-preprocessor-face)
--(if (facep 'font-lock-preprocessor-face) ()
-- (defvar font-lock-preprocessor-face font-lock-keyword-face)
-- (copy-face font-lock-keyword-face 'font-lock-preprocessor-face))
-+(if (boundp 'font-lock-reference-face)
-+ (if (facep 'font-lock-constant-face) ()
-+ (defvar font-lock-constant-face font-lock-reference-face)
-+ (copy-face font-lock-reference-face 'font-lock-constant-face))
-+ (defvar font-lock-preprocessor-face))
-+(if (boundp 'font-lock-keyword-face)
-+ (if (facep 'font-lock-preprocessor-face) ()
-+ (defvar font-lock-preprocessor-face font-lock-keyword-face)
-+ (copy-face font-lock-keyword-face 'font-lock-preprocessor-face)))
-
- (defvar tuareg-font-lock-keywords
- (append
Added: trunk/packages/tuareg-mode/trunk/debian/patches/03_keyword-face.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/03_keyword-face.dpatch 2005-06-05 17:38:30 UTC (rev 1400)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/03_keyword-face.dpatch 2005-06-07 19:03:02 UTC (rev 1401)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_keyword-face.dpatch by Ralf Treinen <treinen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix bug on keyword coloration (thanks to Remi Vanicat).
+
+@DPATCH@
+--- tuareg-mode-1.45.0-beta2/tuareg.el
++++ /tmp/dpep.aVvaHq/tuareg-mode-1.45.0-beta2/tuareg.el
+@@ -387,7 +387,7 @@
+
+ (defface tuareg-font-lock-governing-face
+ (if tuareg-faces-inherit-p
+- '((t :inherit font-lock-keywords-face))
++ '((t :inherit font-lock-keyword-face))
+ '((((background light)) (:foreground "darkorange3" :bold t))
+ (t (:foreground "orange" :bold t))))
+ "Face description for governing/leading keywords."
Property changes on: trunk/packages/tuareg-mode/trunk/debian/patches/03_keyword-face.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch 2005-06-05 17:38:30 UTC (rev 1400)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/04_charsetp.dpatch 2005-06-07 19:03:02 UTC (rev 1401)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_charsetp.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## DP: Fixes compilation error under xemacs21-nomule due to unbound symbol
-## DP: charsetp. Thanks to Meik Hellmund for the patch.
-
-@DPATCH@
---- tuareg-mode-1.45.0-beta1/tuareg.el
-+++ /tmp/dpep.gH6NoU/tuareg-mode-1.45.0-beta1/tuareg.el
-@@ -707,7 +707,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))
Modified: trunk/packages/tuareg-mode/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/svn-deblayout 2005-06-05 17:38:30 UTC (rev 1400)
+++ trunk/packages/tuareg-mode/trunk/debian/svn-deblayout 2005-06-07 19:03:02 UTC (rev 1401)
@@ -1,8 +1,3 @@
-buildArea=/home/rt/debian/packages/pkg-ocaml-maint/trunk/packages/tuareg-mode/build-area
-origDir=/home/rt/debian/packages/pkg-ocaml-maint/trunk/packages/tuareg-mode/upstream
+origDir=../upstream
origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/tuareg-mode/upstream
-tagsDir=/home/rt/debian/packages/pkg-ocaml-maint/tags/packages/tuareg-mode
tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/tuareg-mode
-trunkDir=/home/rt/debian/packages/pkg-ocaml-maint/trunk/packages/tuareg-mode/trunk
-trunkUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/tuareg-mode/trunk
-mergeWithUpstream
Added: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.0-beta2.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.0-beta2.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream