[Pkg-ocaml-maint-commits] r4534 - in /trunk/packages/pagodacf/trunk/debian: changelog control patches/00list patches/scan_parser.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Tue Sep 18 22:16:10 2007
New Revision: 4534

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4534
Log:
Rebuild with OCaml 3.10.

Added:
    trunk/packages/pagodacf/trunk/debian/patches/scan_parser.dpatch   (with props)
Modified:
    trunk/packages/pagodacf/trunk/debian/changelog
    trunk/packages/pagodacf/trunk/debian/control
    trunk/packages/pagodacf/trunk/debian/patches/00list

Modified: trunk/packages/pagodacf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk/debian/changelog?rev=4534&op=diff
==============================================================================
--- trunk/packages/pagodacf/trunk/debian/changelog (original)
+++ trunk/packages/pagodacf/trunk/debian/changelog Tue Sep 18 22:16:10 2007
@@ -1,3 +1,11 @@
+pagodacf (0.8-2) unstable; urgency=low
+
+  * Rebuild with OCaml 3.10.
+  * Added scan_parser.dpatch to fix the FTBFS with OCaml 3.10,
+    closes: #441645.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 18 Sep 2007 22:13:17 +0000
+
 pagodacf (0.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/pagodacf/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk/debian/control?rev=4534&op=diff
==============================================================================
--- trunk/packages/pagodacf/trunk/debian/control (original)
+++ trunk/packages/pagodacf/trunk/debian/control Tue Sep 18 22:16:10 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.1), ocaml-findlib, dpatch
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.10), ocaml-findlib, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pagodacf
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk/

Modified: trunk/packages/pagodacf/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk/debian/patches/00list?rev=4534&op=diff
==============================================================================
--- trunk/packages/pagodacf/trunk/debian/patches/00list (original)
+++ trunk/packages/pagodacf/trunk/debian/patches/00list Tue Sep 18 22:16:10 2007
@@ -1,0 +1,1 @@
+scan_parser

Added: trunk/packages/pagodacf/trunk/debian/patches/scan_parser.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk/debian/patches/scan_parser.dpatch?rev=4534&op=file
==============================================================================
--- trunk/packages/pagodacf/trunk/debian/patches/scan_parser.dpatch (added)
+++ trunk/packages/pagodacf/trunk/debian/patches/scan_parser.dpatch Tue Sep 18 22:16:10 2007
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## scan_parser.dpatch by James Woodyatt <jhw at conjury.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update type declaration for OCaml 3.10.
+
+ at DPATCH@
+diff -urNad pagodacf-0.8~/cf_scan_parser.mli pagodacf-0.8/cf_scan_parser.mli
+--- pagodacf-0.8~/cf_scan_parser.mli	2006-06-29 05:50:42.000000000 +0000
++++ pagodacf-0.8/cf_scan_parser.mli	2007-09-18 22:11:46.000000000 +0000
+@@ -79,7 +79,8 @@
+ *)
+ val cscanf:
+     ('i Cf_seq.t -> ('i #scanner as 's)) -> ('s -> exn -> 'o) ->
+-    ('f, Scanf.Scanning.scanbuf, 'o) format -> 'f -> ('i, 'o) Cf_parser.t
++    ('f, Scanf.Scanning.scanbuf, 'u, 'f -> 'o, 'f -> 'o, 'o) format6 -> 'f ->
++    ('i, 'o) Cf_parser.t
+ 
+ (** Use [scanf fmt rf] to construct a lexical parser that scans the input text
+     according to the scanning format [fmt] and produces the value returned by
+@@ -87,13 +88,14 @@
+     parser unwinds to the next production alternative.
+ *)
+ val scanf:
+-    ('f, Scanf.Scanning.scanbuf, 'o) format -> 'f -> (char, 'o) Cf_parser.t
++    ('f, Scanf.Scanning.scanbuf, 'u, 'f -> 'o, 'f -> 'o, 'o) format6 -> 'f ->
++    (char, 'o) Cf_parser.t
+ 
+ (** Use [scanfx] in place of [scanf] to construct a parser with a cursor weaved
+     into the input stream.
+ *)
+ val scanfx:
+-    ('f, Scanf.Scanning.scanbuf, 'o) format -> 'f ->
++    ('f, Scanf.Scanning.scanbuf, 'u, 'f -> 'o, 'f -> 'o, 'o) format6 -> 'f ->
+     (char #Cf_parser.cursor, char, 'o) Cf_parser.X.t
+ 
+ (*--- End of File [ cf_scan_parser.mli ] ---*)

Propchange: trunk/packages/pagodacf/trunk/debian/patches/scan_parser.dpatch
------------------------------------------------------------------------------
    svn:executable = *