This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository mlgmp.
commit f4c24c63817d7a9bb664db372b3292d09464f70b
Author: Stephane Glondu <st...@glondu.net>
Date: Mon Jul 17 10:13:54 2017 +0200
Switch patches to git format
---
debian/patches/0001-Disabling-MPFR.patch | 19 ++++++
...-native-archs-and-proper-handling-of-.so.patch} | 22 ++++---
...s => 0003-Various-bugfixes-in-C-bindings.patch} | 52 +++++++++-------
...conversion-from-int-on-64-bits-computers.patch} | 69 +++++++++++-----------
...n-declarations-for-de-serialize-function.patch} | 16 +++--
debian/patches/10_config | 11 ----
debian/patches/series | 10 ++--
7 files changed, 118 insertions(+), 81 deletions(-)
diff --git a/debian/patches/0001-Disabling-MPFR.patch
b/debian/patches/0001-Disabling-MPFR.patch
new file mode 100644
index 0000000..2ca4d54
--- /dev/null
+++ b/debian/patches/0001-Disabling-MPFR.patch
@@ -0,0 +1,19 @@
+From: Mike Furr <mf...@debian.org>
+Date: Mon, 17 Jul 2017 09:51:35 +0200
+Subject: Disabling MPFR
+
+---
+ config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.h b/config.h
+index 565c3ef..d580591 100644
+--- a/config.h
++++ b/config.h
+@@ -1,5 +1,5 @@
+ #define SERIALIZE
+-#define USE_MPFR
++/*#define USE_MPFR*/
+ #define NDEBUG
+ #undef TRACE
+
diff --git a/debian/patches/11_Makefile
b/debian/patches/0002-Handling-non-native-archs-and-proper-handling-of-.so.patch
similarity index 84%
rename from debian/patches/11_Makefile
rename to
debian/patches/0002-Handling-non-native-archs-and-proper-handling-of-.so.patch
index cf6e924..aadea6b 100644
--- a/debian/patches/11_Makefile
+++
b/debian/patches/0002-Handling-non-native-archs-and-proper-handling-of-.so.patch
@@ -1,9 +1,15 @@
-Author: Mike Furr <mf...@debian.org>
-Description: Handling non-native archs and proper handling of .so generation
+From: Mike Furr <mf...@debian.org>
+Date: Mon, 17 Jul 2017 09:52:23 +0200
+Subject: Handling non-native archs and proper handling of .so generation
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile
/tmp/dpep-work.HWFzlv/mlgmp-20021123/Makefile
---- ./Makefile 2005-09-03 15:15:47.339340437 -0400
-+++ /tmp/dpep-work.HWFzlv/mlgmp-20021123/Makefile 2005-09-03
15:15:56.140184593 -0400
+---
+ Makefile | 72 +++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 44 insertions(+), 28 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index eca6ae8..d93bbd1 100644
+--- a/Makefile
++++ b/Makefile
@@ -2,12 +2,14 @@
RANLIB= ranlib
@@ -23,7 +29,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./Makefile
/tmp/dpep-work.HWFzlv/mlgmp-
#RLIBFLAGS= -cclib "-Wl,-R $(GMP_LIBDIR)" # Solaris
# RLIBFLAGS= # MacOS X
-@@ -15,33 +17,53 @@
+@@ -15,33 +17,53 @@ LIBFLAGS= -cclib -L. -cclib -L$(GMP_LIBDIR) $(RLIBFLAGS) \
-cclib -lmpfr -cclib -lgmp -cclib -L$(DESTDIR)
CC= gcc
@@ -84,7 +90,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./Makefile
/tmp/dpep-work.HWFzlv/mlgmp-
%.i: %.c
$(CC) $(CFLAGS) -E $*.c > $*.i
-@@ -63,15 +85,9 @@
+@@ -63,15 +85,9 @@ tests: $(LIBS) $(TESTS)
$(CMODULES_O): conversions.c config.h
@@ -103,7 +109,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./Makefile
/tmp/dpep-work.HWFzlv/mlgmp-
pretty_gmp.cmo: pretty_gmp.cmi gmp.cmo
-@@ -81,27 +97,27 @@
+@@ -81,27 +97,27 @@ toplevel: gmp.cma creal.cmo pretty_gmp.cmo install_pp.cmo
creal_pp.cmo install_c
essai: gmp.cma essai.cmo
$(OCAMLC) -custom $+ -o $@
diff --git a/debian/patches/15_bugfixes
b/debian/patches/0003-Various-bugfixes-in-C-bindings.patch
similarity index 72%
rename from debian/patches/15_bugfixes
rename to debian/patches/0003-Various-bugfixes-in-C-bindings.patch
index 40fd3a7..9894cc7 100644
--- a/debian/patches/15_bugfixes
+++ b/debian/patches/0003-Various-bugfixes-in-C-bindings.patch
@@ -1,10 +1,19 @@
-Author: Mike Furr <mf...@debian.org>
-Description: Various bugfixes in C bindings
+From: Mike Furr <mf...@debian.org>
+Date: Mon, 17 Jul 2017 09:52:55 +0200
+Subject: Various bugfixes in C bindings
-diff -urNad --exclude=CVS --exclude=.svn ./gmp.ml
/tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.ml
---- ./gmp.ml 2002-11-23 08:13:53.000000000 -0500
-+++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.ml 2005-09-03
15:18:53.505890041 -0400
-@@ -66,7 +66,7 @@
+---
+ gmp.ml | 3 ++-
+ gmp.mli | 3 ++-
+ mlgmp_z.c | 13 ++++++++++---
+ test_suite.ml | 6 ++++++
+ 4 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/gmp.ml b/gmp.ml
+index e423868..135c3dc 100644
+--- a/gmp.ml
++++ b/gmp.ml
+@@ -66,7 +66,7 @@ module Z2 = struct
external from_float: dest: t->float->unit = "_mlgmp_z2_from_float";;
external create: unit->t = "_mlgmp_z_create";;
@@ -13,7 +22,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./gmp.ml
/tmp/dpep-work.FYBj8e/mlgmp-20
external add: dest: t-> t->t->unit = "_mlgmp_z2_add";;
external sub: dest: t-> t->t->unit = "_mlgmp_z2_sub";;
external mul: dest: t-> t->t->unit = "_mlgmp_z2_mul";;
-@@ -85,6 +85,7 @@
+@@ -85,6 +85,7 @@ end;;
module Z = struct
type t = Z2.t;;
@@ -21,10 +30,11 @@ diff -urNad --exclude=CVS --exclude=.svn ./gmp.ml
/tmp/dpep-work.FYBj8e/mlgmp-20
external of_int: int->t = "_mlgmp_z_from_int";;
external from_int: int->t = "_mlgmp_z_from_int";;
external from_string_base: base:
int->string->t="_mlgmp_z_from_string_base";;
-diff -urNad --exclude=CVS --exclude=.svn ./gmp.mli
/tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.mli
---- ./gmp.mli 2002-11-23 08:13:54.000000000 -0500
-+++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.mli 2005-09-03
15:18:53.505890041 -0400
-@@ -14,7 +14,7 @@
+diff --git a/gmp.mli b/gmp.mli
+index 2d47f1f..9a660e4 100644
+--- a/gmp.mli
++++ b/gmp.mli
+@@ -14,7 +14,7 @@ module Z2 :
= "_mlgmp_z2_from_string_base"
external from_float : dest:t -> float -> unit = "_mlgmp_z2_from_float"
external create : unit -> t = "_mlgmp_z_create"
@@ -33,7 +43,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./gmp.mli
/tmp/dpep-work.FYBj8e/mlgmp-2
external add : dest:t -> t -> t -> unit = "_mlgmp_z2_add"
external sub : dest:t -> t -> t -> unit = "_mlgmp_z2_sub"
external mul : dest:t -> t -> t -> unit = "_mlgmp_z2_mul"
-@@ -31,6 +31,7 @@
+@@ -31,6 +31,7 @@ module Z2 :
module Z :
sig
type t = Z2.t
@@ -41,10 +51,11 @@ diff -urNad --exclude=CVS --exclude=.svn ./gmp.mli
/tmp/dpep-work.FYBj8e/mlgmp-2
external from_int : int -> t = "_mlgmp_z_from_int"
external of_int : int -> t = "_mlgmp_z_from_int"
external from_string_base : base:int -> string -> t
-diff -urNad --exclude=CVS --exclude=.svn ./mlgmp_z.c
/tmp/dpep-work.FYBj8e/mlgmp-20021123/mlgmp_z.c
---- ./mlgmp_z.c 2002-11-23 12:47:20.000000000 -0500
-+++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/mlgmp_z.c 2005-09-03
15:18:53.506889909 -0400
-@@ -58,6 +58,13 @@
+diff --git a/mlgmp_z.c b/mlgmp_z.c
+index 7f81a80..35c8583 100644
+--- a/mlgmp_z.c
++++ b/mlgmp_z.c
+@@ -58,6 +58,13 @@ value _mlgmp_z_copy(value from)
CAMLreturn(r);
}
@@ -58,7 +69,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./mlgmp_z.c
/tmp/dpep-work.FYBj8e/mlgmp
value _mlgmp_z_from_int(value ml_val)
{
CAMLparam1(ml_val);
-@@ -88,21 +95,21 @@
+@@ -88,21 +95,21 @@ value _mlgmp_z_from_float(value ml_val)
value _mlgmp_z2_from_int(value r, value ml_val)
{
CAMLparam2(r, ml_val);
@@ -83,9 +94,10 @@ diff -urNad --exclude=CVS --exclude=.svn ./mlgmp_z.c
/tmp/dpep-work.FYBj8e/mlgmp
CAMLreturn(Val_unit);
}
-diff -urNad --exclude=CVS --exclude=.svn ./test_suite.ml
/tmp/dpep-work.FYBj8e/mlgmp-20021123/test_suite.ml
---- ./test_suite.ml 2002-11-21 07:26:37.000000000 -0500
-+++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/test_suite.ml 2005-09-03
15:18:53.506889909 -0400
+diff --git a/test_suite.ml b/test_suite.ml
+index 64ffcdd..b450386 100644
+--- a/test_suite.ml
++++ b/test_suite.ml
@@ -1,5 +1,11 @@
open Gmp;;
diff --git a/debian/patches/20_mlgmp_z
b/debian/patches/0004-Fix-wrong-conversion-from-int-on-64-bits-computers.patch
similarity index 75%
rename from debian/patches/20_mlgmp_z
rename to
debian/patches/0004-Fix-wrong-conversion-from-int-on-64-bits-computers.patch
index d6298ae..57f3c9e 100644
--- a/debian/patches/20_mlgmp_z
+++
b/debian/patches/0004-Fix-wrong-conversion-from-int-on-64-bits-computers.patch
@@ -1,18 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Description: Fix wrong conversion from int on 64 bits computers
-## Origin/Author: Jean-Christophe Filliâtre
-## Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573978
-## 20_mlgmp_z.dpatch by Mehdi Dogguy <me...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix wrong conversion from int on 64 bits computers.
+From: Mehdi Dogguy <me...@debian.org>
+Date: Mon, 17 Jul 2017 09:54:18 +0200
+Subject: Fix wrong conversion from int on 64 bits computers
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
-@DPATCH@
-Index: mlgmp/mlgmp_z.c
-===================================================================
---- mlgmp.orig/mlgmp_z.c 2015-08-12 13:08:45.326850457 +0200
-+++ mlgmp/mlgmp_z.c 2015-08-12 13:08:45.322850442 +0200
-@@ -70,7 +70,7 @@
+Author: Jean-Christophe Filliâtre
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573978
+---
+ mlgmp_z.c | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/mlgmp_z.c b/mlgmp_z.c
+index 35c8583..35d65fc 100644
+--- a/mlgmp_z.c
++++ b/mlgmp_z.c
+@@ -70,7 +70,7 @@ value _mlgmp_z_from_int(value ml_val)
CAMLparam1(ml_val);
CAMLlocal1(r);
r=alloc_mpz();
@@ -21,7 +24,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(r);
}
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ value _mlgmp_z_from_float(value ml_val)
value _mlgmp_z2_from_int(value r, value ml_val)
{
CAMLparam2(r, ml_val);
@@ -30,7 +33,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(Val_unit);
}
-@@ -158,14 +158,14 @@
+@@ -158,14 +158,14 @@ value _mlgmp_z_##op(value a, value b)
\
CAMLparam2(a, b); \
CAMLlocal1(r); \
r=alloc_init_mpz(); \
@@ -47,7 +50,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(Val_unit); \
}
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ value _mlgmp_z_powm_ui(value a, value b, value modulus)
CAMLparam3(a, b, modulus);
CAMLlocal1(r);
r=alloc_init_mpz();
@@ -56,7 +59,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(r);
}
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ value _mlgmp_z_ui_pow_ui(value a, value b)
CAMLparam2(a, b);
CAMLlocal1(r);
r=alloc_init_mpz();
@@ -65,7 +68,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(r);
}
-@@ -228,14 +228,14 @@
+@@ -228,14 +228,14 @@ value _mlgmp_z_powm(value a, value b, value modulus)
value _mlgmp_z2_powm_ui(value r, value a, value b, value modulus)
{
CAMLparam4(r, a, b, modulus);
@@ -82,7 +85,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(Val_unit);
}
-@@ -383,7 +383,7 @@
+@@ -383,7 +383,7 @@ value _mlgmp_z_##kind##div_qr_ui(value n, value d)
\
{ \
CAMLparam2(n, d); \
CAMLlocal3(q, r, qr);
\
@@ -91,7 +94,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ui_d) division_by_zero(); \
\
-@@ -402,7 +402,7 @@
+@@ -402,7 +402,7 @@ value _mlgmp_z_##kind##div_q_ui(value n, value d)
\
{ \
CAMLparam2(n, d); \
CAMLlocal1(q);
\
@@ -100,7 +103,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ui_d) division_by_zero(); \
\
-@@ -416,7 +416,7 @@
+@@ -416,7 +416,7 @@ value _mlgmp_z_##kind##div_q_ui(value n, value d)
\
value _mlgmp_z2_##kind##div_q_ui(value q, value n, value d) \
{ \
CAMLparam3(q, n, d); \
@@ -109,7 +112,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ui_d) division_by_zero(); \
\
-@@ -429,7 +429,7 @@
+@@ -429,7 +429,7 @@ value _mlgmp_z_##kind##div_r_ui(value n, value d)
\
{ \
CAMLparam2(n, d); \
CAMLlocal1(r);
\
@@ -118,7 +121,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ui_d) division_by_zero(); \
\
-@@ -443,7 +443,7 @@
+@@ -443,7 +443,7 @@ value _mlgmp_z_##kind##div_r_ui(value n, value d)
\
value _mlgmp_z2_##kind##div_r_ui(value r, value n, value d) \
{ \
CAMLparam3(r, n, d); \
@@ -127,7 +130,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ui_d) division_by_zero(); \
\
-@@ -455,7 +455,7 @@
+@@ -455,7 +455,7 @@ value _mlgmp_z2_##kind##div_r_ui(value r, value n, value
d) \
value _mlgmp_z_##kind##div_ui(value n, value d)
\
{ \
CAMLparam2(n, d); \
@@ -136,7 +139,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ui_d) division_by_zero(); \
\
-@@ -499,7 +499,7 @@
+@@ -499,7 +499,7 @@ value _mlgmp_z_##op(value n, value d) \
{ \
CAMLparam2(n, d); \
CAMLlocal1(q); \
@@ -145,7 +148,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ld) \
division_by_zero(); \
-@@ -514,7 +514,7 @@
+@@ -514,7 +514,7 @@ value _mlgmp_z_##op(value n, value d) \
value _mlgmp_z2_##op(value q, value n, value d) \
{ \
CAMLparam3(q, n, d); \
@@ -154,7 +157,7 @@ Index: mlgmp/mlgmp_z.c
\
if (! ld) \
division_by_zero(); \
-@@ -591,7 +591,7 @@
+@@ -591,7 +591,7 @@ value _mlgmp_z_compare(value a, value b)
value _mlgmp_z_compare_si(value a, value b)
{
CAMLparam2(a, b);
@@ -163,7 +166,7 @@ Index: mlgmp/mlgmp_z.c
}
/*** Number theory */
-@@ -652,13 +652,13 @@
+@@ -652,13 +652,13 @@ z_int_binary_op(jacobi)
value _mlgmp_z_kronecker_si(value a, value b)
{
CAMLparam2(a, b);
@@ -179,7 +182,7 @@ Index: mlgmp/mlgmp_z.c
}
value _mlgmp_z_remove(value a, value b)
-@@ -680,7 +680,7 @@
+@@ -680,7 +680,7 @@ value _mlgmp_z_##op(value a) \
CAMLparam1(a); \
CAMLlocal1(r); \
r = alloc_init_mpz(); \
@@ -188,7 +191,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(r); \
}
-@@ -693,7 +693,7 @@
+@@ -693,7 +693,7 @@ value _mlgmp_z_bin_uiui(value n, value k)
CAMLparam2(n, k);
CAMLlocal1(r);
r = alloc_init_mpz();
@@ -197,7 +200,7 @@ Index: mlgmp/mlgmp_z.c
CAMLreturn(r);
}
-@@ -718,7 +718,7 @@
+@@ -718,7 +718,7 @@ z_int_binary_op(hamdist)
value _mlgmp_z_##op(value a, value b) \
{ \
CAMLparam2(a, b); \
@@ -206,7 +209,7 @@ Index: mlgmp/mlgmp_z.c
}
z_int_binary_op_ui(scan0)
-@@ -731,7 +731,7 @@
+@@ -731,7 +731,7 @@ value _mlgmp_z_##op(value state, value n)
\
CAMLparam2(state, n); \
CAMLlocal1(r); \
r = alloc_init_mpz(); \
diff --git a/debian/patches/ocaml4.04
b/debian/patches/0005-Update-extern-declarations-for-de-serialize-function.patch
similarity index 57%
rename from debian/patches/ocaml4.04
rename to
debian/patches/0005-Update-extern-declarations-for-de-serialize-function.patch
index b302e9e..f3494dd 100644
--- a/debian/patches/ocaml4.04
+++
b/debian/patches/0005-Update-extern-declarations-for-de-serialize-function.patch
@@ -1,8 +1,16 @@
-Description: Update extern declarations for [de]serialize functions to match
ocaml 4.04 definitions.
-Author: Dimitri John Ledkov <x...@ubuntu.com>
+From: Dimitri John Ledkov <x...@ubuntu.com>
+Date: Mon, 17 Jul 2017 09:55:20 +0200
+Subject: Update extern declarations for [de]serialize functions to match
+ ocaml 4.04 definitions.
---- mlgmp-20021123.orig/config.h
-+++ mlgmp-20021123/config.h
+---
+ config.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config.h b/config.h
+index d580591..55bd8c8 100644
+--- a/config.h
++++ b/config.h
@@ -58,11 +58,11 @@
#define MPFR_SIZE_ARCH32 16
#define MPFR_SIZE_ARCH64 24
diff --git a/debian/patches/10_config b/debian/patches/10_config
deleted file mode 100644
index a3edbae..0000000
--- a/debian/patches/10_config
+++ /dev/null
@@ -1,11 +0,0 @@
-Author: Mike Furr <mf...@debian.org>
-Description: Disabling MPFR
-
---- mlgmp-20021123.orig/config.h
-+++ mlgmp-20021123/config.h
-@@ -1,5 +1,5 @@
- #define SERIALIZE
--#define USE_MPFR
-+/*#define USE_MPFR*/
- #define NDEBUG
- #undef TRACE
diff --git a/debian/patches/series b/debian/patches/series
index 2b799a3..4039896 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-10_config
-11_Makefile
-15_bugfixes
-20_mlgmp_z
-ocaml4.04
+0001-Disabling-MPFR.patch
+0002-Handling-non-native-archs-and-proper-handling-of-.so.patch
+0003-Various-bugfixes-in-C-bindings.patch
+0004-Fix-wrong-conversion-from-int-on-64-bits-computers.patch
+0005-Update-extern-declarations-for-de-serialize-function.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/mlgmp.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
