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

[Ralf Treinen]

Author: treinen
Date: 2005-12-22 19:37:41 +0000 (Thu, 22 Dec 2005)
New Revision: 2321

Added:
   trunk/packages/tuareg-mode/trunk/debian/patches/04_line-number.dpatch
   trunk/packages/tuareg-mode/upstream/tuareg-mode_1.45.1.orig.tar.gz
Removed:
   trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch
Modified:
   trunk/packages/tuareg-mode/trunk/debian/NEWS
   trunk/packages/tuareg-mode/trunk/debian/changelog
   trunk/packages/tuareg-mode/trunk/debian/control
   trunk/packages/tuareg-mode/trunk/debian/patches/00list
Log:
tuareg-mode 1.45.1-1 (will upload after christmas)


Modified: trunk/packages/tuareg-mode/trunk/debian/NEWS
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/NEWS	2005-12-22 19:05:35 UTC (rev 2320)
+++ trunk/packages/tuareg-mode/trunk/debian/NEWS	2005-12-22 19:37:41 UTC (rev 2321)
@@ -1,4 +1,4 @@
-tuareg-mode (1.45.0-final-1) unstable; urgency=low
+tuareg-mode (1.45.1-1) unstable; urgency=low
   
   * The emacs mode tuareg-mode is now automatically loaded on all files
     with filename extension .ml[iylp]?. If the debian package
@@ -8,7 +8,7 @@
     consult the instuctions given in the file 
     /usr/share/doc/ocaml-mode/README.Debian.
 
-  -- Ralf Treinen <treinen at debian.org>  Thu, 22 Dec 2005 20:00:15 +0100
+ -- Ralf Treinen <treinen at debian.org>  Thu, 22 Dec 2005 20:00:15 +0100
 
 tuareg-mode (1.40.5.1-1) unstable; urgency=low
 

Modified: trunk/packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/changelog	2005-12-22 19:05:35 UTC (rev 2320)
+++ trunk/packages/tuareg-mode/trunk/debian/changelog	2005-12-22 19:37:41 UTC (rev 2321)
@@ -2,14 +2,16 @@
 
   * New upstream release.
   * Install an emacs startup file with priority 51, and replace the installed 
-    append-tuareg.el file by an empty file. Adapt NEWS.Debian accordingly.
+    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:03:54 +0100
+ -- Ralf Treinen <treinen at debian.org>  Thu, 22 Dec 2005 20:14:57 +0100
 
 tuareg-mode (1.45.0-beta3-1) unstable; urgency=low
 

Modified: trunk/packages/tuareg-mode/trunk/debian/control
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/control	2005-12-22 19:05:35 UTC (rev 2320)
+++ trunk/packages/tuareg-mode/trunk/debian/control	2005-12-22 19:37:41 UTC (rev 2321)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Jerome Marant <jerome at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>
+Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Jerome Marant <jerome at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
 Build-Depends-Indep: debhelper (>= 4.0), dpatch
 Standards-Version: 3.6.2
 

Modified: trunk/packages/tuareg-mode/trunk/debian/patches/00list
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-12-22 19:05:35 UTC (rev 2320)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-12-22 19:37:41 UTC (rev 2321)
@@ -1,4 +1,4 @@
 01_camldebug
 02_localdoc
 03_autoload_pattern
-04-line-number
+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-22 19:05:35 UTC (rev 2320)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch	2005-12-22 19:37:41 UTC (rev 2321)
@@ -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)

Copied: trunk/packages/tuareg-mode/trunk/debian/patches/04_line-number.dpatch (from rev 2320, trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch)

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


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