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

[Ralf Treinen]

Author: treinen
Date: 2005-12-28 16:45:06 +0000 (Wed, 28 Dec 2005)
New Revision: 2342

Added:
   trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.2.orig.tar.gz
Removed:
   trunk/packages/tuareg-mode/trunk/debian/patches/04_line-number.dpatch
Modified:
   trunk/packages/tuareg-mode/trunk/debian/changelog
   trunk/packages/tuareg-mode/trunk/debian/patches/00list
Log:
tuareg-mode 1.45.2-1


Modified: trunk/packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/changelog	2005-12-28 13:58:10 UTC (rev 2341)
+++ trunk/packages/tuareg-mode/trunk/debian/changelog	2005-12-28 16:45:06 UTC (rev 2342)
@@ -1,17 +1,17 @@
-tuareg-mode (1.45.1-1) NOTRELEASED; urgency=low
+tuareg-mode (1.45.2-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream release. This release incorporates our patch
+    to work around the missing line-number function
+    in emacs (closes: #341203).
   * Install an emacs startup file with priority 51, and replace the installed 
     append-tuareg.el file by an empty file. Adapt README.Debian accordingly,
     make a note in NEWS.
   * Some improvements in long package description.
   * Patch 03_autoload_pattern: Narrow autoload-pattern down to what is really
     needed for OCaml files. 
-  * Patch 04_line-number: work around the missing line-number function
-    in emacs (closes: #341203).
   * New uploader Sylvain Le Gall.
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 22 Dec 2005 20:14:57 +0100
+ -- Ralf Treinen <treinen at debian.org>  Wed, 28 Dec 2005 15:46:08 +0100
 
 tuareg-mode (1.45.0-beta3-1) unstable; urgency=low
 

Modified: trunk/packages/tuareg-mode/trunk/debian/patches/00list
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-12-28 13:58:10 UTC (rev 2341)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-12-28 16:45:06 UTC (rev 2342)
@@ -1,4 +1,3 @@
 01_camldebug
 02_localdoc
 03_autoload_pattern
-04_line-number

Deleted: trunk/packages/tuareg-mode/trunk/debian/patches/04_line-number.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/04_line-number.dpatch	2005-12-28 13:58:10 UTC (rev 2341)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/04_line-number.dpatch	2005-12-28 16:45:06 UTC (rev 2342)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-line-number.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: work around missing "line-number" function in emacs
-
- at DPATCH@
-diff -urNad trunk~/tuareg.el trunk/tuareg.el
---- trunk~/tuareg.el	2005-12-22 19:38:49.000000000 +0100
-+++ trunk/tuareg.el	2005-12-22 19:40:39.000000000 +0100
-@@ -3301,7 +3301,9 @@
- 	  (goto-char last-and)))
-       (if scan-error
- 	  (message "Parse error when scanning definitions: line %s!"
--		   (line-number))
-+		   (if tuareg-with-xemacs
-+		       (line-number)
-+		     (1+ (count-lines 1 (point)))))
- 	;; Sort and build lists
- 	(mapcar (lambda (pair)
- 		  (if (cdr pair)

Added: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.2.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.2.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream