[Pkg-ocaml-maint-commits] r985 - in packages/tuareg-mode/trunk/debian: . patches
Ralf Treinen
treinen@costa.debian.org
Sat, 19 Feb 2005 15:50:16 +0100
Author: treinen
Date: 2005-02-19 15:50:14 +0100 (Sat, 19 Feb 2005)
New Revision: 985
Added:
packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch
packages/tuareg-mode/trunk/debian/patches/04_version.dpatch
Modified:
packages/tuareg-mode/trunk/debian/changelog
packages/tuareg-mode/trunk/debian/copyright
packages/tuareg-mode/trunk/debian/emacsen-install
packages/tuareg-mode/trunk/debian/emacsen-startup
packages/tuareg-mode/trunk/debian/patches/00list
Log:
tuareg-mode 1.44.3-1
Modified: packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- packages/tuareg-mode/trunk/debian/changelog 2005-02-18 13:39:54 UTC (rev 984)
+++ packages/tuareg-mode/trunk/debian/changelog 2005-02-19 14:50:14 UTC (rev 985)
@@ -1,3 +1,16 @@
+tuareg-mode (1.44.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Some cleanup in emacsen-startup and emacs-install
+ * emacsen-install: remove path.elc after compilation
+ * Patch 03_fontlock: check binding of some font-lock variables to avoid
+ compilation error on installation. Thanks to Jérôme Marillat for his
+ help.
+ * Patch 04_version: fixed version number
+ * copyright: distinguish copyright and licence.
+
+ -- Ralf Treinen <treinen@debian.org> Sat, 19 Feb 2005 15:45:25 +0100
+
tuareg-mode (1.43.2-1) unstable; urgency=low
* New upstream release.
Modified: packages/tuareg-mode/trunk/debian/copyright
===================================================================
--- packages/tuareg-mode/trunk/debian/copyright 2005-02-18 13:39:54 UTC (rev 984)
+++ packages/tuareg-mode/trunk/debian/copyright 2005-02-19 14:50:14 UTC (rev 985)
@@ -5,8 +5,10 @@
Upstream Author: Albert Cohen <Albert.Cohen@inria.fr>
-Copyright:
+Copyright (C) 1997-2005 Albert Cohen <Albert.Cohen@inria.fr>
+Licence:
+
This program is distributed under the GNU General Public License
version 2. On a Debian system the GNU GPL can be found in the file
/usr/share/common-licenses/GPL.
Modified: packages/tuareg-mode/trunk/debian/emacsen-install
===================================================================
--- packages/tuareg-mode/trunk/debian/emacsen-install 2005-02-18 13:39:54 UTC (rev 984)
+++ packages/tuareg-mode/trunk/debian/emacsen-install 2005-02-19 14:50:14 UTC (rev 985)
@@ -12,14 +12,7 @@
echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-# SITEFLAG="-no-site-file"
-#else
-# SITEFLAG="--no-site-file"
-#fi
FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
-
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
@@ -40,6 +33,6 @@
(setq load-path (cons "." load-path) byte-compile-warnings nil)
EOF
${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+rm -f *.el path.el path.elc
exit 0
Modified: packages/tuareg-mode/trunk/debian/emacsen-startup
===================================================================
--- packages/tuareg-mode/trunk/debian/emacsen-startup 2005-02-18 13:39:54 UTC (rev 984)
+++ packages/tuareg-mode/trunk/debian/emacsen-startup 2005-02-19 14:50:14 UTC (rev 985)
@@ -1,18 +1,10 @@
;; -*-emacs-lisp-*-
;;
;; Emacs startup file for the Debian GNU/Linux tuareg-mode package
-;;
-;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd@debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv@vanzandt.mv.com>
-;; The tuareg-mode package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...). The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(setq load-path (cons (concat "/usr/share/"
- (symbol-name flavor)
- "/site-lisp/tuareg-mode") load-path))
+(setq load-path
+ (cons
+ (concat "/usr/share/" (symbol-name flavor) "/site-lisp/tuareg-mode")
+ load-path))
Modified: packages/tuareg-mode/trunk/debian/patches/00list
===================================================================
--- packages/tuareg-mode/trunk/debian/patches/00list 2005-02-18 13:39:54 UTC (rev 984)
+++ packages/tuareg-mode/trunk/debian/patches/00list 2005-02-19 14:50:14 UTC (rev 985)
@@ -1,2 +1,4 @@
01_camldebug
02_localdoc
+03_fontlock
+04_version
Added: packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch
===================================================================
--- packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch 2005-02-18 13:39:54 UTC (rev 984)
+++ packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch 2005-02-19 14:50:14 UTC (rev 985)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fontlock.dpatch by Ralf Treinen <treinen@debian.org>
+##
+## DP: avoid compilation error of camldebug when font-lock is not
+## 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
+ font-lock-comment-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)))
++(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
Property changes on: packages/tuareg-mode/trunk/debian/patches/03_fontlock.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/tuareg-mode/trunk/debian/patches/04_version.dpatch
===================================================================
--- packages/tuareg-mode/trunk/debian/patches/04_version.dpatch 2005-02-18 13:39:54 UTC (rev 984)
+++ packages/tuareg-mode/trunk/debian/patches/04_version.dpatch 2005-02-19 14:50:14 UTC (rev 985)
@@ -0,0 +1,18 @@
+#! /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.
+
Property changes on: packages/tuareg-mode/trunk/debian/patches/04_version.dpatch
___________________________________________________________________
Name: svn:executable
+ *