[Pkg-ocaml-maint-commits] r6300 - in /trunk/packages/cmigrep/trunk/debian: changelog patches/00list patches/02no-private-flag.dpatch

[treinen at users.alioth.debian.org]

Author: treinen
Date: Mon Mar  2 20:08:13 2009
New Revision: 6300

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6300
Log:
patch for ocaml 3.11

Added:
    trunk/packages/cmigrep/trunk/debian/patches/02no-private-flag.dpatch   (with props)
Modified:
    trunk/packages/cmigrep/trunk/debian/changelog
    trunk/packages/cmigrep/trunk/debian/patches/00list

Modified: trunk/packages/cmigrep/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/changelog?rev=6300&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/changelog (original)
+++ trunk/packages/cmigrep/trunk/debian/changelog Mon Mar  2 20:08:13 2009
@@ -1,5 +1,7 @@
-cmigrep (1.5-3) UNRELEASED; urgency=low
+cmigrep (1.5-3) unstable; urgency=low
 
+  * Patch 02no-private-flag: some constructors in the typing/types module
+    of the compiler libs have lost the "private" field.
   * Convert to cdbs, build-depend on cdbs and dh-ocaml
   * Add dependency on ${misc:Depends}
   * Rename debian/dirs -> debian/cmigrep.dirs, 
@@ -7,8 +9,9 @@
   * Create debian/cmigrep.manpages
   * Cleanup Uploaders
   * Standards-Version: 3.8.0 (no change)
+  * Recompile for ocaml 3.11.
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 22 Feb 2009 14:07:07 +0100
+ -- Ralf Treinen <treinen at debian.org>  Mon, 02 Mar 2009 21:05:56 +0100
 
 cmigrep (1.5-2) unstable; urgency=low
 

Modified: trunk/packages/cmigrep/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/patches/00list?rev=6300&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/patches/00list (original)
+++ trunk/packages/cmigrep/trunk/debian/patches/00list Mon Mar  2 20:08:13 2009
@@ -1,1 +1,2 @@
 01make-without-godi
+02no-private-flag

Added: trunk/packages/cmigrep/trunk/debian/patches/02no-private-flag.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/patches/02no-private-flag.dpatch?rev=6300&op=file
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/patches/02no-private-flag.dpatch (added)
+++ trunk/packages/cmigrep/trunk/debian/patches/02no-private-flag.dpatch Mon Mar  2 20:08:13 2009
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-private-flag.dpatch by Ralf Treinen <treinen at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The fields Type_variant and Type_record have lost the "private"
+## DP: field in the passage from ocaml 3.10 to 3.11. [treinen at debian.org]
+
+ at DPATCH@
+diff -urNad trunk~/cmigrep.ml trunk/cmigrep.ml
+--- trunk~/cmigrep.ml	2008-04-02 02:37:07.000000000 +0200
++++ trunk/cmigrep.ml	2009-03-02 21:01:16.000000000 +0100
+@@ -304,7 +304,7 @@
+     (function
+        | Tsig_type (id, type_decl, _rec_status) ->
+            begin match type_decl.type_kind with
+-           | Type_variant (constructors, _private) ->
++           | Type_variant (constructors) ->
+                List.iter
+                  (fun (name, type_exprs) ->
+                     if Pcre.pmatch ~rex:exp name then begin
+@@ -382,7 +382,7 @@
+     (function
+        | Tsig_type (id, type_decl, _rec_status) ->
+            begin match type_decl.type_kind with
+-           | Type_record (labels, _, _) ->
++           | Type_record (labels, _) ->
+                List.iter
+                  (fun (name, mutable_flag, type_expr) ->
+                     if Pcre.pmatch ~rex:exp name then begin

Propchange: trunk/packages/cmigrep/trunk/debian/patches/02no-private-flag.dpatch
------------------------------------------------------------------------------
    svn:executable = *