Package: src:geneweb
Version: 6.03-1
Severity: wishlist
Tags: patch
Dear Maintainer,
Your package fails to build from source with camlp5 6.05 (not yet
uploaded, but available in git [1]). I've lost the build log, but the
failure is basically due to the removal of Stdpp.Exc_located (which
has been deprecated for a while, and was an alias to Ploc.Exc in
6.04). The attached patch fixes the compilation.
[1] http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/camlp5.git
Cheers,
--
Stéphane
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Description: Fix FTBFS with camlp5 6.05
Author: Stephane Glondu <glo...@debian.org>
--- geneweb-6.03.orig/src/srcfile.ml
+++ geneweb-6.03/src/srcfile.ml
@@ -192,7 +192,7 @@ END;
value extract_date d =
try Some (G.Entry.parse date (G.parsable (Stream.of_string d))) with
- [ Stdpp.Exc_located _ (Stream.Error _ | Token.Error _) -> None ]
+ [ Ploc.Exc _ (Stream.Error _ | Token.Error _) -> None ]
;
value string_of_start_date conf =
--- geneweb-6.03.orig/src/gwd.ml
+++ geneweb-6.03/src/gwd.ml
@@ -1804,7 +1804,7 @@ value robot_exclude_arg s =
robot_xcl.val :=
Some (G.Entry.parse robot_xcl_arg (G.parsable (Stream.of_string s)))
with
- [ Stdpp.Exc_located _ (Stream.Error _ | Token.Error _) ->
+ [ Ploc.Exc _ (Stream.Error _ | Token.Error _) ->
do {
eprintf "Bad use of option -robot_xcl\n";
eprintf "Use option -help for usage.\n";
--- geneweb-6.03.orig/ged2gwb/ged2gwb2.ml
+++ geneweb-6.03/ged2gwb/ged2gwb2.ml
@@ -754,10 +754,10 @@ value date_of_field pos d =
let s = Stream.of_string (String.uppercase d) in
date_str.val := d;
try Some (Grammar.Entry.parse date_value s) with
- [ Stdpp.Exc_located loc (Stream.Error _) ->
+ [ Ploc.Exc loc (Stream.Error _) ->
let s = Stream.of_string (String.uppercase d) in
try Some (Grammar.Entry.parse date_value_recover s) with
- [ Stdpp.Exc_located loc (Stream.Error _) -> Some (Dtext d) ] ]
+ [ Ploc.Exc loc (Stream.Error _) -> Some (Dtext d) ] ]
}
;
@@ -1224,7 +1224,7 @@ value decode_date_interval pos s =
| Begin d -> (Some d, None)
| End d -> (None, Some d) ]
with
- [ Stdpp.Exc_located _ _ | Not_found ->
+ [ Ploc.Exc _ _ | Not_found ->
do { print_bad_date pos s; (None, None) } ]
;
@@ -2550,7 +2550,7 @@ The database \"%s\" already exists. Use
try main () with e ->
let e =
match e with
- [ Stdpp.Exc_located _ e -> e
+ [ Ploc.Exc _ e -> e
| _ -> e ]
in
do {
--- geneweb-6.03.orig/ged2gwb/ged2gwb.ml
+++ geneweb-6.03/ged2gwb/ged2gwb.ml
@@ -857,10 +857,10 @@ value date_of_field pos d =
let s = Stream.of_string (String.uppercase d) in
date_str.val := d;
try Some (Grammar.Entry.parse date_value s) with
- [ Stdpp.Exc_located loc (Stream.Error _) ->
+ [ Ploc.Exc loc (Stream.Error _) ->
let s = Stream.of_string (String.uppercase d) in
try Some (Grammar.Entry.parse date_value_recover s) with
- [ Stdpp.Exc_located loc (Stream.Error _) -> Some (Dtext d) ] ]
+ [ Ploc.Exc loc (Stream.Error _) -> Some (Dtext d) ] ]
}
;
@@ -1327,7 +1327,7 @@ value decode_date_interval pos s =
| Begin d -> (Some d, None)
| End d -> (None, Some d) ]
with
- [ Stdpp.Exc_located _ _ | Not_found ->
+ [ Ploc.Exc _ _ | Not_found ->
do { print_bad_date pos s; (None, None) } ]
;
@@ -2968,7 +2968,7 @@ The database \"%s\" already exists. Use
try main () with e ->
let e =
match e with
- [ Stdpp.Exc_located _ e -> e
+ [ Ploc.Exc _ e -> e
| _ -> e ]
in
do {
