[Pkg-ocaml-maint-commits] r1021 - in packages/tuareg-mode/experimental: . debian debian/patches
Ralf Treinen
treinen@costa.debian.org
Sun, 20 Mar 2005 22:00:10 +0100
Author: treinen
Date: 2005-03-20 22:00:09 +0100 (Sun, 20 Mar 2005)
New Revision: 1021
Added:
packages/tuareg-mode/experimental/tuareg-mode_1.44.3-1.45.0.rc1.orig.tar.gz
Removed:
packages/tuareg-mode/experimental/debian/patches/04_version.dpatch
packages/tuareg-mode/experimental/tuareg-mode_1.44.3.orig.tar.gz
Modified:
packages/tuareg-mode/experimental/debian/changelog
packages/tuareg-mode/experimental/debian/patches/00list
packages/tuareg-mode/experimental/debian/patches/03_fontlock.dpatch
Log:
files and patches for 1.45.0-rc1
Modified: packages/tuareg-mode/experimental/debian/changelog
===================================================================
--- packages/tuareg-mode/experimental/debian/changelog 2005-03-20 20:20:00 UTC (rev 1020)
+++ packages/tuareg-mode/experimental/debian/changelog 2005-03-20 21:00:09 UTC (rev 1021)
@@ -1,3 +1,11 @@
+tuareg-mode (1.44.3-1.45.0.rc1-1) experimental; urgency=low
+
+ * New upstream release candidate
+ * Removed patch 04_version - fixed by upstream.
+ * Adapted patch 03_fontlock to new upstream version.
+
+ -- Ralf Treinen <treinen@debian.org> Sun, 20 Mar 2005 21:52:48 +0100
+
tuareg-mode (1.44.3-2) unstable; urgency=low
* Fixed an embarrassing typo in changelog entry of 1.44.3-1.
Modified: packages/tuareg-mode/experimental/debian/patches/00list
===================================================================
--- packages/tuareg-mode/experimental/debian/patches/00list 2005-03-20 20:20:00 UTC (rev 1020)
+++ packages/tuareg-mode/experimental/debian/patches/00list 2005-03-20 21:00:09 UTC (rev 1021)
@@ -1,4 +1,3 @@
01_camldebug
02_localdoc
03_fontlock
-04_version
Modified: packages/tuareg-mode/experimental/debian/patches/03_fontlock.dpatch
===================================================================
--- packages/tuareg-mode/experimental/debian/patches/03_fontlock.dpatch 2005-03-20 20:20:00 UTC (rev 1020)
+++ packages/tuareg-mode/experimental/debian/patches/03_fontlock.dpatch 2005-03-20 21:00:09 UTC (rev 1021)
@@ -5,26 +5,27 @@
## DP: loaded (thanks to Jérôme Marant for his 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
+--- tuareg-mode-1.44.3-1.45.0.rc1/tuareg.el
++++ /tmp/dpep.0CTVsa/tuareg-mode-1.44.3-1.45.0.rc1/tuareg.el
+@@ -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))
--(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 (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-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)))
(defvar tuareg-font-lock-keywords
- (list
+ (append
Deleted: packages/tuareg-mode/experimental/debian/patches/04_version.dpatch
===================================================================
--- packages/tuareg-mode/experimental/debian/patches/04_version.dpatch 2005-03-20 20:20:00 UTC (rev 1020)
+++ packages/tuareg-mode/experimental/debian/patches/04_version.dpatch 2005-03-20 21:00:09 UTC (rev 1021)
@@ -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.
-
Added: packages/tuareg-mode/experimental/tuareg-mode_1.44.3-1.45.0.rc1.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: packages/tuareg-mode/experimental/tuareg-mode_1.44.3-1.45.0.rc1.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: packages/tuareg-mode/experimental/tuareg-mode_1.44.3.orig.tar.gz
===================================================================
(Binary files differ)