The following commit has been merged in the master branch:
commit 05e64fd362045c08fa99d9f8ba2100538632c1c5
Author: Mehdi Dogguy <me...@debian.org>
Date:   Tue May 15 13:40:31 2012 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 5fc087f..8487f83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocaml-zarith (1.1-1) unstable; urgency=low
+
+  * New upstream release
+    - Remove Debian patches (integrated by upstream).
+    - ocamldoc is called with "-charset" command-line flag, which
+      comes with OCaml 3.12.1. Update Build-Depends accordingly.
+
+ -- Mehdi Dogguy <me...@debian.org>  Tue, 15 May 2012 13:39:48 +0200
+
 ocaml-zarith (1.0-6) unstable; urgency=low
 
   * Don't run test-suite if DEB_BUILD_OPTIONS contains "nocheck".
diff --git a/debian/control b/debian/control
index 57a7be6..8025c35 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers 
<debian-ocaml-ma...@lists.debian.org>
 Uploaders: Mehdi Dogguy <me...@debian.org>
 Build-Depends:
   debhelper (>= 8),
-  ocaml-nox (>= 3.12),
+  ocaml-nox (>= 3.12.1),
   dh-ocaml (>= 0.9.1),
   libgmp3-dev,
   ocaml-findlib
diff --git 
a/debian/patches/0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
 
b/debian/patches/0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
deleted file mode 100644
index 3de4dab..0000000
--- 
a/debian/patches/0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: antoinemine <antoinemine@198b03b0-60d5-47cb-a09e-f81db6e26457>
-Date: Thu, 1 Sep 2011 14:01:50 +0000
-Subject: [PATCH] added -failsafe flag to ocamkmklib seems to make building 
with static libgmp work (bug #1034)
-
-git-svn-id: svn://scm.ocamlcore.org/svn/zarith/trunk@36 
198b03b0-60d5-47cb-a09e-f81db6e26457
----
- project.mak |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/project.mak b/project.mak
-index 111de08..470c8a1 100644
---- a/project.mak
-+++ b/project.mak
-@@ -31,16 +31,16 @@ TOINSTALL = zarith.a zarith.cma zarith.cmxa zarith.cmxs 
libzarith.a $(MLISRC) $(
- all: $(TOINSTALL) test
- 
- zarith.cma: $(MLSRC:%.ml=%.cmo)
--      $(OCAMLMKLIB) -o zarith $+ $(LIBS)
-+      $(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
- 
- zarith.cmxa zarith.a: $(MLSRC:%.ml=%.cmx)
--      $(OCAMLMKLIB) -o zarith $+ $(LIBS)
-+      $(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
- 
- zarith.cmxs: zarith.cmxa libzarith.a
-       $(OCAMLOPT) -shared -o $@ -I . zarith.cmxa
- 
- libzarith.a dllzarith.so: $(SSRC:%.S=%.o) $(CSRC:%.c=%.o) 
--      $(OCAMLMKLIB) -o zarith $+ $(LIBS)
-+      $(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
- 
- test: zarith.cmxa test.cmx
-       $(OCAMLOPT) $(OCAMLOPTFLAGS) $(OCAMLINC) -cclib "-L." $+ -o $@
-@@ -109,7 +109,7 @@ $(AUTOGEN): z.mlp z.mlip $(SSRC) z_pp.pl
-       $(OCAMLOPT) $(OCAMLOPTFLAGS) $(OCAMLINC) -c $<
- 
- %.o: %.c
--      $(OCAMLC) -verbose -ccopt "$(CFLAGS)" -c $<
-+      $(OCAMLC) -ccopt "$(CFLAGS)" -c $<
- 
- clean:
-       /bin/rm -rf *.o *.a *.so *.cmi *.cmo *.cmx *.cmxa *.cmxs *.cma *.dll *~ 
\#* depend test $(AUTOGEN) tmp.c depend
--- 
diff --git a/debian/patches/0002-Make-it-byte-arch-aware.patch 
b/debian/patches/0002-Make-it-byte-arch-aware.patch
deleted file mode 100644
index 3c05848..0000000
--- a/debian/patches/0002-Make-it-byte-arch-aware.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Thu, 29 Sep 2011 18:27:09 +0200
-Subject: [PATCH] Make it byte-arch aware
-
----
- project.mak |   16 +++++++++++++---
- 1 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/project.mak b/project.mak
-index 470c8a1..22b6c0b 100644
---- a/project.mak
-+++ b/project.mak
-@@ -22,13 +22,23 @@ MLISRC = z.mli q.mli big_int_Z.mli
- AUTOGEN = z.ml z.mli
- 
- CMIOBJ = $(MLISRC:%.mli=%.cmi)
--TOINSTALL = zarith.a zarith.cma zarith.cmxa zarith.cmxs libzarith.a $(MLISRC) 
$(CMIOBJ)
--
-+TOINSTALL = zarith.cma libzarith.a $(MLISRC) $(CMIOBJ)
-+ifneq (,$(wildcard /usr/bin/$(OCAMLOPT)))
-+TOINSTALL += zarith.a zarith.cmxa
-+ifneq (,$(wildcard $(shell $(OCAMLC) -where)/dynlink.cmxa))
-+TOINSTALL += zarith.cmxs
-+endif
-+endif
- 
- # build targets
- ###############
- 
--all: $(TOINSTALL) test
-+all:: $(TOINSTALL)
-+ifneq (,$(wildcard /usr/bin/$(OCAMLOPT)))
-+all:: test
-+else
-+all:: test.b
-+endif
- 
- zarith.cma: $(MLSRC:%.ml=%.cmo)
-       $(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
--- 
diff --git a/debian/patches/0003-Disable-charset-when-calling-ocamldoc.patch 
b/debian/patches/0003-Disable-charset-when-calling-ocamldoc.patch
deleted file mode 100644
index 8dbf05f..0000000
--- a/debian/patches/0003-Disable-charset-when-calling-ocamldoc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Thu, 29 Sep 2011 09:52:39 +0200
-Subject: [PATCH] Disable -charset when calling ocamldoc
-
-This command line option comes with OCaml 3.12.1, which is not in
-Debian yet. We should drop this patch as soon as it enters in.
----
- project.mak |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/project.mak b/project.mak
-index 22b6c0b..2ef2e9e 100644
---- a/project.mak
-+++ b/project.mak
-@@ -66,7 +66,7 @@ bitest: zarith.cmxa  bitest.cmx
- 
- doc: $(MLISRC)
-       mkdir -p html
--      $(OCAMLDOC) -html -d html -charset utf8 $+
-+      $(OCAMLDOC) -html -d html $+
- 
- 
- 
--- 
diff --git a/debian/patches/0004-ocamlopt-is-not-really-required.patch 
b/debian/patches/0004-ocamlopt-is-not-really-required.patch
deleted file mode 100644
index 2bd1b4d..0000000
--- a/debian/patches/0004-ocamlopt-is-not-really-required.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Sun, 2 Oct 2011 11:53:22 +0200
-Subject: [PATCH] ocamlopt is not really required
-
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 5bd80d3..980aedd 100755
---- a/configure
-+++ b/configure
-@@ -186,7 +186,7 @@ checkcc()
- 
- searchbinreq $ocaml
- searchbinreq $ocamlc
--searchbinreq $ocamlopt
-+searchbin    $ocamlopt
- searchbinreq $ocamldep
- searchbinreq $ocamlmklib
- searchbinreq $ocamldoc
--- 
diff --git a/debian/patches/0005-Detect-more-arch-triplets.patch 
b/debian/patches/0005-Detect-more-arch-triplets.patch
deleted file mode 100644
index 6086b85..0000000
--- a/debian/patches/0005-Detect-more-arch-triplets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Wed, 5 Oct 2011 09:01:14 +0200
-Subject: [PATCH] Detect more arch-triplets
-
----
- configure |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 980aedd..092fc2b 100755
---- a/configure
-+++ b/configure
-@@ -255,10 +255,10 @@ fi
- 
- arch='none'
- case $host in
--    x86_64-*linux-gnu)
-+    x86_64-*linux-gnu|x86_64-kfreebsd-gnu)
-         ccdef="-DZ_ELF $ccdef"
-         arch='x86_64';;
--    i686-*linux-gnu)
-+    i486-*linux-gnu|i686-*linux-gnu|i486-kfreebsd-gnu)
-         ccdef="-DZ_ELF $ccdef"
-         arch='i686';;
-     i686-*cygwin)
--- 
diff --git a/debian/patches/0006-Use-memcpy-instead-of-cast-ing.patch 
b/debian/patches/0006-Use-memcpy-instead-of-cast-ing.patch
deleted file mode 100644
index cde6443..0000000
--- a/debian/patches/0006-Use-memcpy-instead-of-cast-ing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Fri, 4 Nov 2011 14:40:30 +0100
-Subject: [PATCH] Use memcpy instead of cast'ing
-
-Fixes an FTBFS on sparc machines.
----
- caml_z.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/caml_z.c b/caml_z.c
-index fcb0fc1..23eee61 100644
---- a/caml_z.c
-+++ b/caml_z.c
-@@ -490,7 +490,11 @@ CAMLprim value ml_z_of_float(value v)
- #endif
-   Z_MARK_SLOW;
-   if (isinf(x) || isnan(x)) ml_z_raise_overflow();
-+#if __sparc__
-+  memcpy(&y, v, sizeof(int64));
-+#else
-   y = *((int64*)v);
-+#endif
-   exp = ((y >> 52) & 0x7ff) - 1023; /* exponent */
-   if (exp < 0) return(Val_long(0));
-   m = (y & 0x000fffffffffffffLL) | 0x0010000000000000LL; /* mantissa */
--- 
diff --git 
a/debian/patches/0007-Fixed-1-bit-precision-loss-when-converting-doubles-t.patch
 
b/debian/patches/0007-Fixed-1-bit-precision-loss-when-converting-doubles-t.patch
deleted file mode 100644
index 7c1aea8..0000000
--- 
a/debian/patches/0007-Fixed-1-bit-precision-loss-when-converting-doubles-t.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5acb95c9e2dac398910f0431c399c5e8467ace50 Mon Sep 17 00:00:00 2001
-From: antoinemine <antoinemine@198b03b0-60d5-47cb-a09e-f81db6e26457>
-Date: Fri, 23 Mar 2012 20:45:52 +0000
-Subject: [PATCH] Fixed 1-bit precision loss when converting doubles to
- rationals. Thanks to Andres Varon.
-
-git-svn-id: svn://scm.ocamlcore.org/svn/zarith/trunk@56 
198b03b0-60d5-47cb-a09e-f81db6e26457
----
- q.ml |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/q.ml b/q.ml
-index 8809e98..90b7c77 100644
---- a/q.ml
-+++ b/q.ml
-@@ -82,8 +82,8 @@ let of_float d =
-   if d = neg_infinity then minus_inf else
-   if classify_float d = FP_nan then undef else
-   let m,e = frexp d in
--  (* pu in the form  m * 2^e, where m is an integer *)
--  let m,e = Z.of_float (ldexp m 52), e-52 in
-+  (* put into the form m * 2^e, where m is an integer *)
-+  let m,e = Z.of_float (ldexp m 53), e-53 in
-   if e >= 0 then of_bigint (Z.shift_left m e)
-   else make m (Z.shift_left Z.one (-e))
- 
--- 
-1.7.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 22e1756..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +0,0 @@
-0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
-0002-Make-it-byte-arch-aware.patch
-0003-Disable-charset-when-calling-ocamldoc.patch
-0004-ocamlopt-is-not-really-required.patch
-0005-Detect-more-arch-triplets.patch
-0006-Use-memcpy-instead-of-cast-ing.patch
-0007-Fixed-1-bit-precision-loss-when-converting-doubles-t.patch

-- 
ocaml-zarith packaging

_______________________________________________
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

Reply via email to