[Pkg-ocaml-maint-commits] [cmigrep] 01/05: Switch patches to dom-{apply, save}-patches workflow

Stéphane Glondu glondu at alioth.debian.org
Sun Nov 10 15:41:35 UTC 2013


This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cmigrep.

commit b70d0a24ec4411b217d143ec2cf1e24f5986e89c
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Nov 10 16:25:11 2013 +0100

    Switch patches to dom-{apply,save}-patches workflow
---
 ...ithout-godi => 0001-Compile-without-godi.patch} |   20 ++++++++++++-----
 ...{no-private-flag => 0002-No-private-flag.patch} |   23 ++++++++++++++------
 debian/patches/series                              |    4 ++--
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/debian/patches/make-without-godi b/debian/patches/0001-Compile-without-godi.patch
old mode 100755
new mode 100644
similarity index 63%
rename from debian/patches/make-without-godi
rename to debian/patches/0001-Compile-without-godi.patch
index 3c456e7..ba06769
--- a/debian/patches/make-without-godi
+++ b/debian/patches/0001-Compile-without-godi.patch
@@ -1,10 +1,17 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: Compile without godi. Provide directly the include directories for
-  the compiler-libs.
+From: Ralf Treinen <treinen at debian.org>
+Date: Fri, 13 Nov 2009 20:11:48 +0100
+Subject: Compile without godi
 
---- trunk~/Makefile	2007-04-01 16:43:39.000000000 +0200
-+++ trunk/Makefile	2007-07-07 10:18:23.000000000 +0200
-@@ -16,17 +16,15 @@
+Provide directly the include directories for the compiler-libs.
+---
+ Makefile | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 546acc6..b3378fa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,17 +16,15 @@ typedtree.cmo ctype.cmo printtyp.cmo includeclass.cmo mtype.cmo		\
  includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo	\
  typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
  
@@ -26,3 +33,4 @@ Description: Compile without godi. Provide directly the include directories for
  	-package pcre,findlib,unix -linkpkg $(BYTESOURCES)
  
  install:
+-- 
diff --git a/debian/patches/no-private-flag b/debian/patches/0002-No-private-flag.patch
old mode 100755
new mode 100644
similarity index 56%
rename from debian/patches/no-private-flag
rename to debian/patches/0002-No-private-flag.patch
index b112fba..d081499
--- a/debian/patches/no-private-flag
+++ b/debian/patches/0002-No-private-flag.patch
@@ -1,10 +1,18 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: The fields Type_variant and Type_record have lost the "private"
-  field in the passage from ocaml 3.10 to 3.11.
+From: Ralf Treinen <treinen at debian.org>
+Date: Fri, 13 Nov 2009 20:11:48 +0100
+Subject: No private flag
 
---- 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 @@
+The fields Type_variant and Type_record have lost the "private" field
+in the passage from ocaml 3.10 to 3.11.
+---
+ cmigrep.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmigrep.ml b/cmigrep.ml
+index dcab49e..cdac8b3 100755
+--- a/cmigrep.ml
++++ b/cmigrep.ml
+@@ -304,7 +304,7 @@ let print_constructor print_path path s exp =
      (function
         | Tsig_type (id, type_decl, _rec_status) ->
             begin match type_decl.type_kind with
@@ -13,7 +21,7 @@ Description: The fields Type_variant and Type_record have lost the "private"
                 List.iter
                   (fun (name, type_exprs) ->
                      if Pcre.pmatch ~rex:exp name then begin
-@@ -382,7 +382,7 @@
+@@ -382,7 +382,7 @@ let print_record_label print_path path s exp =
      (function
         | Tsig_type (id, type_decl, _rec_status) ->
             begin match type_decl.type_kind with
@@ -22,3 +30,4 @@ Description: The fields Type_variant and Type_record have lost the "private"
                 List.iter
                   (fun (name, mutable_flag, type_expr) ->
                      if Pcre.pmatch ~rex:exp name then begin
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index ccc6908..dcce0c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-make-without-godi
-no-private-flag
+0001-Compile-without-godi.patch
+0002-No-private-flag.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git



More information about the Pkg-ocaml-maint-commits mailing list