[Pkg-ocaml-maint-commits] r1388 - tags/packages trunk/packages/tuareg-mode trunk/packages/tuareg-mode/trunk trunk/packages/tuareg-mode/trunk/debian trunk/packages/tuareg-mode/trunk/debian/patches trunk/packages/tuareg-mode/upstream
Ralf Treinen
treinen@costa.debian.org
Sun, 29 May 2005 18:21:54 +0000
Author: treinen
Date: 2005-05-29 18:21:52 +0000 (Sun, 29 May 2005)
New Revision: 1388
Added:
tags/packages/tuareg-mode/
trunk/packages/tuareg-mode/upstream/
trunk/packages/tuareg-mode/upstream/tuareg-mode_1.44.3.orig.tar.gz
trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.0-beta1.orig.tar.gz
Removed:
trunk/packages/tuareg-mode/trunk/debian/patches/04_version.dpatch
trunk/packages/tuareg-mode/trunk/tuareg-mode_1.44.3.orig.tar.gz
Modified:
trunk/packages/tuareg-mode/trunk/debian/
trunk/packages/tuareg-mode/trunk/debian/changelog
trunk/packages/tuareg-mode/trunk/debian/patches/00list
trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch
Log:
tuareg-mode 1.45.0-rc1
convert to svn-buildpackage
Property changes on: trunk/packages/tuareg-mode/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/changelog 2005-05-22 20:17:33 UTC (rev 1387)
+++ trunk/packages/tuareg-mode/trunk/debian/changelog 2005-05-29 18:21:52 UTC (rev 1388)
@@ -1,3 +1,12 @@
+tuareg-mode (1.45.0-beta1-1) unstable; urgency=low
+
+ * New upstream version (called 1.45.0-rc1 by upstream)
+ * Corrected variable settings in patch 03_fontlock - thanks to Remi Vanicat
+ (closes: Bug# 311155).
+ * Removed patch 04_version since obsolete for this upstream version.
+
+ -- Ralf Treinen <treinen@debian.org> Sun, 29 May 2005 20:06:34 +0200
+
tuareg-mode (1.44.3-2) unstable; urgency=low
* Fixed an embarrassing typo in changelog entry of 1.44.3-1.
Modified: trunk/packages/tuareg-mode/trunk/debian/patches/00list
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/00list 2005-05-22 20:17:33 UTC (rev 1387)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/00list 2005-05-29 18:21:52 UTC (rev 1388)
@@ -1,4 +1,3 @@
01_camldebug
02_localdoc
03_fontlock
-04_version
Modified: trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch 2005-05-22 20:17:33 UTC (rev 1387)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch 2005-05-29 18:21:52 UTC (rev 1388)
@@ -1,30 +1,34 @@
#! /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 for his help)
+## DP: loaded (thanks to Jérôme Marant and Remi Vanicat for their help)
@DPATCH@
---- tuareg-mode-1.44.3/tuareg.el
-+++ /tmp/dpep.YXfEPg/tuareg-mode-1.44.3/tuareg.el
-@@ -743,12 +743,14 @@
- font-lock-doc-face
+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-constant-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)))
-+(if (boundp 'font-lock-preprocessor-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
- (list
+ (append
Deleted: trunk/packages/tuareg-mode/trunk/debian/patches/04_version.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/04_version.dpatch 2005-05-22 20:17:33 UTC (rev 1387)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/04_version.dpatch 2005-05-29 18:21:52 UTC (rev 1388)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_version.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix version number
-
-@DPATCH@
---- tuareg-mode-1.44.3/tuareg.el 2005-02-19 15:41:48.000000000 +0100
-+++ /tmp/dpep.D87QHS/tuareg-mode-1.44.3/tuareg.el 2005-02-19 15:42:10.000000000 +0100
-@@ -20,7 +20,7 @@
- (require 'cl)
- (require 'easymenu)
-
--(defconst tuareg-mode-version "Tuareg Version 1.44.2"
-+(defconst tuareg-mode-version "Tuareg Version 1.44.3"
- " Copyright © 1997-2005 Albert Cohen, all rights reserved.
- Copying is covered by the GNU General Public License.
-
Deleted: trunk/packages/tuareg-mode/trunk/tuareg-mode_1.44.3.orig.tar.gz
===================================================================
(Binary files differ)
Added: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.44.3.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.44.3.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.0-beta1.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.0-beta1.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream