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

Thu May 22 23:27:47 UTC 2008

Author: glondu-guest
Date: Thu May 22 23:27:46 2008
New Revision: 5674

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5674
Log:
 * Fix FTBFS: The implementation cf_ip4_addr.ml does not match the
   interface cf_ip4_addr.cmi (Closes: #482448).
 * Add Homepage field to debian/control.
 * Update Standards-Version to 3.7.3 (no changes required).

Added:
    trunk/packages/pagodacf/trunk/debian/patches/01_polymorphic_variant_bugfix.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=5674&op=diff
==============================================================================

--- trunk/packages/pagodacf/trunk/debian/changelog (original)
+++ trunk/packages/pagodacf/trunk/debian/changelog Thu May 22 23:27:46 2008
@@ -1,8 +1,15 @@
 pagodacf (0.9-2) UNRELEASED; urgency=low
 
+  [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 31 Dec 2007 16:50:16 +0100
+  [ Stephane Glondu ]
+  * Fix FTBFS: The implementation cf_ip4_addr.ml does not match the
+    interface cf_ip4_addr.cmi (Closes: #482448).
+  * Add Homepage field to debian/control.
+  * Update Standards-Version to 3.7.3 (no changes required).
+
+ -- Stephane Glondu <steph at glondu.net>  Fri, 23 May 2008 01:25:59 +0200
 
 pagodacf (0.9-1) unstable; urgency=low
 
@@ -110,4 +117,3 @@
   * Initial Release, closes: #266168.
 
  -- Samuel Mimram <samuel.mimram at ens-lyon.org>  Tue, 17 Aug 2004 18:14:36 +0200
-

Modified: trunk/packages/pagodacf/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk/debian/control?rev=5674&op=diff
==============================================================================
--- trunk/packages/pagodacf/trunk/debian/control (original)
+++ trunk/packages/pagodacf/trunk/debian/control Thu May 22 23:27:46 2008
@@ -4,7 +4,8 @@
 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.10), ocaml-findlib, dpatch
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://www.sourceforge.net/projects/ocnae/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk
 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=5674&op=diff
==============================================================================
--- trunk/packages/pagodacf/trunk/debian/patches/00list (original)
+++ trunk/packages/pagodacf/trunk/debian/patches/00list Thu May 22 23:27:46 2008
@@ -1,0 +1,1 @@
+01_polymorphic_variant_bugfix.dpatch

Added: trunk/packages/pagodacf/trunk/debian/patches/01_polymorphic_variant_bugfix.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pagodacf/trunk/debian/patches/01_polymorphic_variant_bugfix.dpatch?rev=5674&op=file
==============================================================================
--- trunk/packages/pagodacf/trunk/debian/patches/01_polymorphic_variant_bugfix.dpatch (added)
+++ trunk/packages/pagodacf/trunk/debian/patches/01_polymorphic_variant_bugfix.dpatch Thu May 22 23:27:46 2008
@@ -1,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_polymorphic_variant_bugfix.dpatch by Stephane Glondu <steph at glondu.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bugfix in polymorphic variant types for compilation with OCaml 3.10.2
+
+ at DPATCH@
+diff -urNad trunk~/cf_ip4_addr.mli trunk/cf_ip4_addr.mli
+--- trunk~/cf_ip4_addr.mli	2006-07-09 07:55:47.000000000 +0200
++++ trunk/cf_ip4_addr.mli	2008-05-23 01:09:54.000000000 +0200
+@@ -127,10 +127,10 @@
+ val all_routers_group: multicast t
+ 
+ (** Use [equal a1 a2] to compare two IPv4 addresses for equality. *)
+-val equal: [> opaque ] t -> [> opaque ] t -> bool
++val equal: ([> opaque ] as 'a) t -> 'a t -> bool
+ 
+ (** Use [compare a1 a2] to compare the ordinality of two IPv4 addresses. *)
+-val compare: [> opaque ] t -> [> opaque ] t -> int
++val compare: ([> opaque ] as 'a) t -> 'a t -> int
+ 
+ (** Use [pton s] to convert the string [s] containing an IPv4 address in
+     dot-quad format to its equivalent opaque IPv4 address.  Returns [None] if
+diff -urNad trunk~/cf_ip6_addr.mli trunk/cf_ip6_addr.mli
+--- trunk~/cf_ip6_addr.mli	2006-07-09 07:55:47.000000000 +0200
++++ trunk/cf_ip6_addr.mli	2008-05-23 01:09:54.000000000 +0200
+@@ -167,10 +167,10 @@
+ val link_local_all_routers: multicast t
+ 
+ (** Use [equal a1 a2] to compare two IPv6 addresses for equality. *)
+-val equal: [> opaque ] t -> [> opaque ] t -> bool
++val equal: ([> opaque ] as 'a) t -> 'a t -> bool
+ 
+ (** Use [compare a1 a2] to compare the ordinality of two IPv6 addresses. *)
+-val compare: [> opaque ] t -> [> opaque ] t -> int
++val compare: ([> opaque ] as 'a) t -> 'a t -> int
+ 
+ (** Use [pton s] to convert the string [s] containing an IPv6 address in
+     numeric format to its equivalent opaque IPv6 address.  Returns [None] if

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


