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

glondu pushed a commit to branch master
in repository apron.

commit e4d2b445a877aa217f05ea1203014e77cac16f13
Author: Stephane Glondu <st...@glondu.net>
Date:   Wed Dec 25 12:42:07 2013 +0100

    Reformat patches to fit dom-{apply,save}-patches workflow
---
 .../{rpath.diff => 0001-Remove-rpaths.patch}       | 102 ++++++++-------
 .../{soname.diff => 0002-Add-sonames.patch}        |  79 ++++++-----
 ...er-to-be-able-to-build-on-non-native-arc.patch} | 145 ++++++++++++---------
 ...> 0004-Patch-in-order-to-resolve-symbols.patch} |  78 ++++++-----
 debian/patches/0005-Install-oct-.a.patch           |  23 ++++
 ...emove-references-to-obsolete-mpfr_random.patch} |  23 ++--
 ...> 0007-Fix-rounding-mode-check-in-assert.patch} |   9 +-
 debian/patches/oct_static                          |  13 --
 debian/patches/series                              |  14 +-
 9 files changed, 271 insertions(+), 215 deletions(-)

diff --git a/debian/patches/rpath.diff b/debian/patches/0001-Remove-rpaths.patch
similarity index 79%
rename from debian/patches/rpath.diff
rename to debian/patches/0001-Remove-rpaths.patch
index 9b5d607..7fd22ee 100644
--- a/debian/patches/rpath.diff
+++ b/debian/patches/0001-Remove-rpaths.patch
@@ -1,14 +1,23 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rpath.dpatch by Samuel Mimram <smim...@debian.org>
-##
-## Remove rpaths.
+From: Samuel Mimram <smim...@debian.org>
+Date: Wed, 25 Dec 2013 12:30:29 +0100
+Subject: Remove rpaths
 
-@DPATCH@
-Index: apron/apron/box/Makefile
-===================================================================
---- apron.orig/apron/box/Makefile      2009-10-25 14:54:21.000000000 +0100
-+++ apron/apron/box/Makefile   2009-10-25 14:57:09.000000000 +0100
-@@ -178,9 +178,9 @@
+Last-Update: 2009-10-25
+---
+ apron/box/Makefile        |  8 ++++----
+ apron/mlapronidl/Makefile |  8 ++++----
+ apron/newpolka/Makefile   |  8 ++++----
+ apron/octagons/Makefile   |  8 ++++----
+ apron/ppl/Makefile        | 12 ++++++------
+ apron/products/Makefile   |  8 ++++----
+ mlgmpidl/Makefile         |  4 ++--
+ 7 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/apron/box/Makefile b/apron/box/Makefile
+index 81a6432..4df02ea 100644
+--- a/apron/box/Makefile
++++ b/apron/box/Makefile
+@@ -178,9 +178,9 @@ libbox%_caml_debug.a: box_caml_debug.o libbox%_debug.a
        $(RANLIB) $@
  
  libbox%_caml.so: box_caml.o libbox%.so
@@ -20,7 +29,7 @@ Index: apron/apron/box/Makefile
  
  dllbox%_caml.so: libbox%_caml.so
        ln -s -f $^ $@
-@@ -204,10 +204,10 @@
+@@ -204,10 +204,10 @@ box.a: boxMPQ.a
        ln -s -f $^ $@
  
  box%.cma: box.cmo libbox%_caml.a libbox%.a
@@ -33,11 +42,11 @@ Index: apron/apron/box/Makefile
  
  #---------------------------------------
  # IDL rules
-Index: apron/apron/mlapronidl/Makefile
-===================================================================
---- apron.orig/apron/mlapronidl/Makefile       2009-10-25 14:54:21.000000000 
+0100
-+++ apron/apron/mlapronidl/Makefile    2009-10-25 14:57:09.000000000 +0100
-@@ -105,10 +105,10 @@
+diff --git a/apron/mlapronidl/Makefile b/apron/mlapronidl/Makefile
+index 589f611..02e2aa5 100644
+--- a/apron/mlapronidl/Makefile
++++ b/apron/mlapronidl/Makefile
+@@ -105,10 +105,10 @@ install: $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) 
$(CCLIB_TOINSTALL) $(CCINC_TOINS
  #---------------------------------------
  
  apron.cma: apron.cmo libapron_caml.a
@@ -50,7 +59,7 @@ Index: apron/apron/mlapronidl/Makefile
  
  libapron_caml.a: $(CCMODULES:%=%.o)
        $(AR) rc $@ $^
-@@ -118,10 +118,10 @@
+@@ -118,10 +118,10 @@ libapron_caml_debug.a: $(CCMODULES:%=%_debug.o)
        $(RANLIB) $@
  
  libapron_caml.so: $(CCMODULES:%=%.o) ../apron/libapron.so
@@ -63,11 +72,11 @@ Index: apron/apron/mlapronidl/Makefile
  
  dllapron_caml.so: libapron_caml.so
        ln -s $^ $@
-Index: apron/apron/newpolka/Makefile
-===================================================================
---- apron.orig/apron/newpolka/Makefile 2009-10-25 14:54:21.000000000 +0100
-+++ apron/apron/newpolka/Makefile      2009-10-25 14:57:09.000000000 +0100
-@@ -209,9 +209,9 @@
+diff --git a/apron/newpolka/Makefile b/apron/newpolka/Makefile
+index badff8b..88e44ee 100644
+--- a/apron/newpolka/Makefile
++++ b/apron/newpolka/Makefile
+@@ -209,9 +209,9 @@ libpolka%_caml_debug.a: polka_caml_debug.o 
libpolka%_debug.a
        $(RANLIB) $@
  
  libpolka%_caml.so: polka_caml.o libpolka%.so
@@ -79,7 +88,7 @@ Index: apron/apron/newpolka/Makefile
  
  dllpolka%_caml.so: libpolka%_caml.so
        ln -s -f $^ $@
-@@ -230,10 +230,10 @@
+@@ -230,10 +230,10 @@ polka.a: polkaMPQ.a
        ln -s -f $^ $@
  
  polka%.cma: polka.cmo libpolka%_caml.a libpolka%.a
@@ -92,11 +101,11 @@ Index: apron/apron/newpolka/Makefile
  
  #---------------------------------------
  # IDL rules
-Index: apron/apron/octagons/Makefile
-===================================================================
---- apron.orig/apron/octagons/Makefile 2009-10-25 14:54:21.000000000 +0100
-+++ apron/apron/octagons/Makefile      2009-10-25 14:57:09.000000000 +0100
-@@ -277,10 +277,10 @@
+diff --git a/apron/octagons/Makefile b/apron/octagons/Makefile
+index 7aa3f3e..fab88b0 100644
+--- a/apron/octagons/Makefile
++++ b/apron/octagons/Makefile
+@@ -277,10 +277,10 @@ oct.a: octMPQ.a
        ln -s -f $^ $@
  
  oct%.cma: oct.cmi oct.cmo liboct%_caml.a liboct%.a
@@ -109,7 +118,7 @@ Index: apron/apron/octagons/Makefile
  
  liboct%_caml.a: oct_caml.o liboct%.a
        $(AR) rcs $@ $<
-@@ -289,9 +289,9 @@
+@@ -289,9 +289,9 @@ liboct%_caml_debug.a: oct_caml_debug.o liboct%_debug.a
        $(AR) rcs $@ $<
        $(RANLIB) $@
  liboct%_caml.so: oct_caml.o liboct%.so
@@ -121,11 +130,11 @@ Index: apron/apron/octagons/Makefile
  dlloct%_caml.so: liboct%_caml.so
        ln -s -f $^ $@
  dlloct%_caml_debug.so: liboct%_caml_debug.so
-Index: apron/apron/ppl/Makefile
-===================================================================
---- apron.orig/apron/ppl/Makefile      2009-10-25 14:54:22.000000000 +0100
-+++ apron/apron/ppl/Makefile   2009-10-25 14:57:26.000000000 +0100
-@@ -126,9 +126,9 @@
+diff --git a/apron/ppl/Makefile b/apron/ppl/Makefile
+index b20f769..98cb5a8 100644
+--- a/apron/ppl/Makefile
++++ b/apron/ppl/Makefile
+@@ -126,9 +126,9 @@ libap_ppl_debug.a: $(subst .cc,_debug.o,$(CXXSOURCES))
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES))
@@ -137,7 +146,7 @@ Index: apron/apron/ppl/Makefile
  
  ap_ppl_test: libap_ppl_debug.a ppl_test_debug.o
        $(CXX) $(CXXFLAGS) -o $@ ppl_test_debug.o \
-@@ -177,19 +177,19 @@
+@@ -177,19 +177,19 @@ libap_ppl_caml_debug.a: ap_ppl_caml_debug.o
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libap_ppl_caml.so: ap_ppl_caml.o libap_ppl.so
@@ -161,11 +170,11 @@ Index: apron/apron/ppl/Makefile
  
  manager.idl: ../mlapronidl/manager.idl
        ln -s $< $@
-Index: apron/apron/products/Makefile
-===================================================================
---- apron.orig/apron/products/Makefile 2009-10-25 14:54:22.000000000 +0100
-+++ apron/apron/products/Makefile      2009-10-25 14:57:09.000000000 +0100
-@@ -121,9 +121,9 @@
+diff --git a/apron/products/Makefile b/apron/products/Makefile
+index e0e03d1..3a0da67 100644
+--- a/apron/products/Makefile
++++ b/apron/products/Makefile
+@@ -121,9 +121,9 @@ libpolkaGrid_caml_debug.a: polkaGrid_caml_debug.o
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libpolkaGrid_caml.so: polkaGrid_caml.o libap_pkgrid.so
@@ -177,7 +186,7 @@ Index: apron/apron/products/Makefile
  dllpolkaGrid_caml.so: libpolkaGrid_caml.so
        ln -s -f $^ $@
  dllpolkaGrid_caml_debug.so: libpolkaGrid_caml_debug.so
-@@ -134,10 +134,10 @@
+@@ -134,10 +134,10 @@ dllpolkaGrid_caml_debug.so: libpolkaGrid_caml_debug.so
  #---------------------------------------
  
  polkaGrid.cma: polkaGrid.cmo libpolkaGrid_caml.a libap_pkgrid.a
@@ -190,11 +199,11 @@ Index: apron/apron/products/Makefile
  
  #---------------------------------------
  # IDL rules
-Index: apron/mlgmpidl/Makefile
-===================================================================
---- apron.orig/mlgmpidl/Makefile       2009-10-25 14:54:21.000000000 +0100
-+++ apron/mlgmpidl/Makefile    2009-10-25 14:57:09.000000000 +0100
-@@ -164,9 +164,9 @@
+diff --git a/mlgmpidl/Makefile b/mlgmpidl/Makefile
+index 14b2cfd..60f78ed 100644
+--- a/mlgmpidl/Makefile
++++ b/mlgmpidl/Makefile
+@@ -164,9 +164,9 @@ libgmp_caml_debug.a: $(CCMODULES:%=%_debug.o)
        $(RANLIB) $@
  
  libgmp_caml.so: $(CCMODULES:%=%.o)
@@ -206,3 +215,4 @@ Index: apron/mlgmpidl/Makefile
  
  dllgmp_caml.so: libgmp_caml.so
        ln -s $^ $@
+-- 
diff --git a/debian/patches/soname.diff b/debian/patches/0002-Add-sonames.patch
similarity index 65%
rename from debian/patches/soname.diff
rename to debian/patches/0002-Add-sonames.patch
index 0c6a655..ef69bf2 100644
--- a/debian/patches/soname.diff
+++ b/debian/patches/0002-Add-sonames.patch
@@ -1,14 +1,22 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## soname.dpatch by Samuel Mimram <smim...@debian.org>
-##
-## Add sonames.
+From: Samuel Mimram <smim...@debian.org>
+Date: Wed, 25 Dec 2013 12:30:44 +0100
+Subject: Add sonames
 
-@DPATCH@
-Index: apron/apron/apron/Makefile
-===================================================================
---- apron.orig/apron/apron/Makefile    2009-10-25 15:36:44.000000000 +0100
-+++ apron/apron/apron/Makefile 2009-10-25 15:39:19.000000000 +0100
-@@ -133,12 +133,12 @@
+Last-Update: 2009-10-25
+---
+ apron/apron/Makefile    | 4 ++--
+ apron/box/Makefile      | 4 ++--
+ apron/newpolka/Makefile | 4 ++--
+ apron/octagons/Makefile | 2 +-
+ apron/ppl/Makefile      | 4 ++--
+ apron/products/Makefile | 4 ++--
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/apron/apron/Makefile b/apron/apron/Makefile
+index 47dc608..e272685 100644
+--- a/apron/apron/Makefile
++++ b/apron/apron/Makefile
+@@ -133,12 +133,12 @@ libapron_debug.a: $(C_FILES:%.c=%_debug.o) 
$(C_FILES_AUX:%.c=%MPQ_debug.o) $(C_F
  
  libapron.so: $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) 
$(C_FILES_AUX:%.c=%D.o)  $(C_FILES_AUX:%.c=%MPFR.o) ../itv/libitv.a
        for i in `$(AR) t ../itv/libitv.a`; do ln -s ../itv/$$i $$i; done
@@ -23,11 +31,11 @@ Index: apron/apron/apron/Makefile
        for i in `$(AR) t ../itv/libitv_debug.a`; do $(RM) $$i; done
  
  .PHONY : dep
-Index: apron/apron/box/Makefile
-===================================================================
---- apron.orig/apron/box/Makefile      2009-10-25 15:36:44.000000000 +0100
-+++ apron/apron/box/Makefile   2009-10-25 15:38:09.000000000 +0100
-@@ -145,9 +145,9 @@
+diff --git a/apron/box/Makefile b/apron/box/Makefile
+index 4df02ea..0b8510e 100644
+--- a/apron/box/Makefile
++++ b/apron/box/Makefile
+@@ -145,9 +145,9 @@ libbox%_debug.a: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libbox%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
@@ -39,11 +47,11 @@ Index: apron/apron/box/Makefile
  
  %MPQ.o: %.c
        $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $<
-Index: apron/apron/newpolka/Makefile
-===================================================================
---- apron.orig/apron/newpolka/Makefile 2009-10-25 15:36:44.000000000 +0100
-+++ apron/apron/newpolka/Makefile      2009-10-25 15:39:51.000000000 +0100
-@@ -169,9 +169,9 @@
+diff --git a/apron/newpolka/Makefile b/apron/newpolka/Makefile
+index 88e44ee..0801afc 100644
+--- a/apron/newpolka/Makefile
++++ b/apron/newpolka/Makefile
+@@ -169,9 +169,9 @@ libpolka%_debug.a: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libpolka%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
@@ -55,11 +63,11 @@ Index: apron/apron/newpolka/Makefile
  
  %Rl.o: %.c $(CCINC)
        $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_LONGRAT -c -o $@ $<
-Index: apron/apron/octagons/Makefile
-===================================================================
---- apron.orig/apron/octagons/Makefile 2009-10-25 15:36:44.000000000 +0100
-+++ apron/apron/octagons/Makefile      2009-10-25 15:40:08.000000000 +0100
-@@ -174,7 +174,7 @@
+diff --git a/apron/octagons/Makefile b/apron/octagons/Makefile
+index fab88b0..dd6efb9 100644
+--- a/apron/octagons/Makefile
++++ b/apron/octagons/Makefile
+@@ -174,7 +174,7 @@ liboct%_debug.a: $(subst .c,%_debug.o,$(CCSOURCES))
        $(RANLIB) $@
  
  liboct%.so: $(subst .c,%.o,$(CCSOURCES))
@@ -68,11 +76,11 @@ Index: apron/apron/octagons/Makefile
  
  octtest%: liboct%_debug.a oct_test%.o
        $(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ oct_test$*.o \
-Index: apron/apron/ppl/Makefile
-===================================================================
---- apron.orig/apron/ppl/Makefile      2009-10-25 15:36:44.000000000 +0100
-+++ apron/apron/ppl/Makefile   2009-10-25 15:40:27.000000000 +0100
-@@ -126,9 +126,9 @@
+diff --git a/apron/ppl/Makefile b/apron/ppl/Makefile
+index 98cb5a8..d5af29e 100644
+--- a/apron/ppl/Makefile
++++ b/apron/ppl/Makefile
+@@ -126,9 +126,9 @@ libap_ppl_debug.a: $(subst .cc,_debug.o,$(CXXSOURCES))
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES))
@@ -84,11 +92,11 @@ Index: apron/apron/ppl/Makefile
  
  ap_ppl_test: libap_ppl_debug.a ppl_test_debug.o
        $(CXX) $(CXXFLAGS) -o $@ ppl_test_debug.o \
-Index: apron/apron/products/Makefile
-===================================================================
---- apron.orig/apron/products/Makefile 2009-10-25 15:36:44.000000000 +0100
-+++ apron/apron/products/Makefile      2009-10-25 15:40:47.000000000 +0100
-@@ -106,9 +106,9 @@
+diff --git a/apron/products/Makefile b/apron/products/Makefile
+index 3a0da67..0b3bf3b 100644
+--- a/apron/products/Makefile
++++ b/apron/products/Makefile
+@@ -106,9 +106,9 @@ libap_pkgrid_debug.a: ap_pkgrid_debug.o
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libap_pkgrid.so: ap_pkgrid.o
@@ -100,3 +108,4 @@ Index: apron/apron/products/Makefile
  
  #---------------------------------------
  # C rules
+-- 
diff --git a/debian/patches/nonopt.diff 
b/debian/patches/0003-Patch-in-order-to-be-able-to-build-on-non-native-arc.patch
similarity index 73%
rename from debian/patches/nonopt.diff
rename to 
debian/patches/0003-Patch-in-order-to-be-able-to-build-on-non-native-arc.patch
index f0b8a13..fbea875 100644
--- a/debian/patches/nonopt.diff
+++ 
b/debian/patches/0003-Patch-in-order-to-be-able-to-build-on-non-native-arc.patch
@@ -1,25 +1,50 @@
-Index: apron/mlgmpidl/Makefile
-===================================================================
---- apron.orig/mlgmpidl/Makefile       2009-10-29 21:33:24.000000000 +0100
-+++ apron/mlgmpidl/Makefile    2009-10-29 21:33:24.000000000 +0100
-@@ -83,7 +83,11 @@
- # Rules
- #---------------------------------------
+From: Samuel Mimram <smim...@debian.org>
+Date: Wed, 25 Dec 2013 12:31:14 +0100
+Subject: Patch in order to be able to build on non-native archs
+
+Last-Update: 2010-01-17
+---
+ apron/box/Makefile        | 16 +++++++++++-----
+ apron/mlapronidl/Makefile | 12 ++++++++++--
+ apron/newpolka/Makefile   | 13 ++++++++++---
+ apron/octagons/Makefile   | 27 +++++++++++++++++++--------
+ apron/ppl/Makefile        |  6 +++++-
+ apron/products/Makefile   |  5 ++++-
+ mlgmpidl/Makefile         |  6 +++++-
+ 7 files changed, 64 insertions(+), 21 deletions(-)
+
+diff --git a/apron/box/Makefile b/apron/box/Makefile
+index 0b8510e..2f51414 100644
+--- a/apron/box/Makefile
++++ b/apron/box/Makefile
+@@ -71,11 +71,17 @@ allD: libboxD.so libboxD_debug.so
+ allMPFR: libboxMPFR.so libboxMPFR_debug.so
+ endif
  
--all: $(MLSRC) $(MLINT) $(MLOBJ) $(MLOBJx) gmp.cma gmp.cmxa libgmp_caml.a
-+all: $(MLSRC) $(MLINT) $(MLOBJ) gmp.cma libgmp_caml.a
+-ml: box.mli box.ml box.cmi box.cmx box.a mlMPQ mlD mlMPFR box.cma box.cmxa
+-
+-mlMPQ: boxMPQ.cma boxMPQ.cmxa libboxMPQ_caml.a libboxMPQ_caml_debug.a 
+-mlD: boxD.cma boxD.cmxa libboxD_caml.a libboxD_caml_debug.a
+-mlMPFR: boxMPFR.cma boxMPFR.cmxa libboxMPFR_caml.a libboxMPFR_caml_debug.a
++ml: box.mli box.ml box.cmi mlMPQ mlD mlMPFR box.cma
 +
++mlMPQ: boxMPQ.cma libboxMPQ_caml.a libboxMPQ_caml_debug.a 
++mlD: boxD.cma libboxD_caml.a libboxD_caml_debug.a
++mlMPFR: boxMPFR.cma libboxMPFR_caml.a libboxMPFR_caml_debug.a
 +ifeq ($(OCAML_BEST),opt)
-+all: $(MLOBJx) gmp.cmxa
++ml: box.cmx box.a box.cmxa
++mlMPQ: boxMPQ.cmxa
++mlD: boxD.cmxa
++mlMPFR: boxMPFR.cmxa
 +endif
- 
  ifneq ($(HAS_SHARED),)
- all: libgmp_caml.so
-Index: apron/apron/mlapronidl/Makefile
-===================================================================
---- apron.orig/apron/mlapronidl/Makefile       2009-10-29 21:33:24.000000000 
+0100
-+++ apron/apron/mlapronidl/Makefile    2009-10-29 21:38:54.000000000 +0100
-@@ -58,7 +58,11 @@
+ mlMPQ: libboxMPQ_caml.so libboxMPQ_caml_debug.so dllboxMPQ_caml.so 
dllboxMPQ_caml_debug.so
+ mlD: libboxD_caml.so libboxD_caml_debug.so dllboxD_caml.so 
dllboxD_caml_debug.so
+diff --git a/apron/mlapronidl/Makefile b/apron/mlapronidl/Makefile
+index 02e2aa5..e9e6354 100644
+--- a/apron/mlapronidl/Makefile
++++ b/apron/mlapronidl/Makefile
+@@ -58,7 +58,11 @@ CCINC_TOINSTALL = apron_caml.h
  # Rules
  #---------------------------------------
  
@@ -32,7 +57,7 @@ Index: apron/apron/mlapronidl/Makefile
  
  ifneq ($(HAS_SHARED),)
  all: libapron_caml.so libapron_caml_debug.so dllapron_caml.so 
dllapron_caml_debug.so
-@@ -94,12 +98,16 @@
+@@ -94,12 +98,16 @@ distclean:
        /bin/rm -f $(CCLIB_TOINSTALL:%=$(APRON_PREFIX)/lib/%)
        /bin/rm -f $(CCINC_TOINSTALL:%=$(APRON_PREFIX)/include/%)
  
@@ -50,11 +75,11 @@ Index: apron/apron/mlapronidl/Makefile
  #---------------------------------------
  # Library rules
  #---------------------------------------
-Index: apron/apron/newpolka/Makefile
-===================================================================
---- apron.orig/apron/newpolka/Makefile 2009-10-29 21:33:24.000000000 +0100
-+++ apron/apron/newpolka/Makefile      2009-10-29 21:33:24.000000000 +0100
-@@ -83,10 +83,17 @@
+diff --git a/apron/newpolka/Makefile b/apron/newpolka/Makefile
+index 0801afc..d7a2ab4 100644
+--- a/apron/newpolka/Makefile
++++ b/apron/newpolka/Makefile
+@@ -83,10 +83,17 @@ allMPQ: libpolkaMPQ.so libpolkaMPQ_debug.so
  allRll: libpolkaRll.so libpolkaRll_debug.so
  endif
  
@@ -75,37 +100,11 @@ Index: apron/apron/newpolka/Makefile
  ifneq ($(HAS_SHARED),)
  mlMPQ: libpolkaMPQ_caml.so libpolkaMPQ_caml_debug.so dllpolkaMPQ_caml.so 
dllpolkaMPQ_caml_debug.so
  mlRll: libpolkaRll_caml.so libpolkaRll_caml_debug.so dllpolkaRll_caml.so 
dllpolkaRll_caml_debug.so
-Index: apron/apron/box/Makefile
-===================================================================
---- apron.orig/apron/box/Makefile      2009-10-29 21:33:24.000000000 +0100
-+++ apron/apron/box/Makefile   2009-10-29 21:33:24.000000000 +0100
-@@ -71,11 +71,17 @@
- allMPFR: libboxMPFR.so libboxMPFR_debug.so
- endif
- 
--ml: box.mli box.ml box.cmi box.cmx box.a mlMPQ mlD mlMPFR box.cma box.cmxa
-+ml: box.mli box.ml box.cmi mlMPQ mlD mlMPFR box.cma
- 
--mlMPQ: boxMPQ.cma boxMPQ.cmxa libboxMPQ_caml.a libboxMPQ_caml_debug.a 
--mlD: boxD.cma boxD.cmxa libboxD_caml.a libboxD_caml_debug.a
--mlMPFR: boxMPFR.cma boxMPFR.cmxa libboxMPFR_caml.a libboxMPFR_caml_debug.a
-+mlMPQ: boxMPQ.cma libboxMPQ_caml.a libboxMPQ_caml_debug.a 
-+mlD: boxD.cma libboxD_caml.a libboxD_caml_debug.a
-+mlMPFR: boxMPFR.cma libboxMPFR_caml.a libboxMPFR_caml_debug.a
-+ifeq ($(OCAML_BEST),opt)
-+ml: box.cmx box.a box.cmxa
-+mlMPQ: boxMPQ.cmxa
-+mlD: boxD.cmxa
-+mlMPFR: boxMPFR.cmxa
-+endif
- ifneq ($(HAS_SHARED),)
- mlMPQ: libboxMPQ_caml.so libboxMPQ_caml_debug.so dllboxMPQ_caml.so 
dllboxMPQ_caml_debug.so
- mlD: libboxD_caml.so libboxD_caml_debug.so dllboxD_caml.so 
dllboxD_caml_debug.so
-Index: apron/apron/octagons/Makefile
-===================================================================
---- apron.orig/apron/octagons/Makefile 2009-10-29 21:33:24.000000000 +0100
-+++ apron/apron/octagons/Makefile      2009-10-29 21:33:24.000000000 +0100
-@@ -243,15 +243,26 @@
+diff --git a/apron/octagons/Makefile b/apron/octagons/Makefile
+index dd6efb9..2341648 100644
+--- a/apron/octagons/Makefile
++++ b/apron/octagons/Makefile
+@@ -243,15 +243,26 @@ octtest%: liboct%_debug.a oct_test%.o
  
  .INTERMEDIATE: mlIl
  
@@ -140,11 +139,11 @@ Index: apron/apron/octagons/Makefile
  ifneq ($(HAS_SHARED),)
  mlIl: liboctIl_caml.so liboctIl_caml_debug.so dlloctIl_caml.so 
dlloctIl_caml_debug.so 
  mlIll:liboctIll_caml.so liboctIll_caml_debug.so dlloctIll_caml.so 
dlloctIll_caml_debug.so 
-Index: apron/apron/ppl/Makefile
-===================================================================
---- apron.orig/apron/ppl/Makefile      2009-10-29 21:33:24.000000000 +0100
-+++ apron/apron/ppl/Makefile   2009-10-29 21:33:24.000000000 +0100
-@@ -154,7 +154,11 @@
+diff --git a/apron/ppl/Makefile b/apron/ppl/Makefile
+index d5af29e..4551316 100644
+--- a/apron/ppl/Makefile
++++ b/apron/ppl/Makefile
+@@ -154,7 +154,11 @@ ap_ppl_test: libap_ppl_debug.a ppl_test_debug.o
  # Caml part
  #-----------------------------------
  
@@ -157,11 +156,11 @@ Index: apron/apron/ppl/Makefile
  
  ifneq ($(HAS_SHARED),)
  ml: libap_ppl_caml.so libap_ppl_caml_debug.so dllap_ppl_caml.so 
dllap_ppl_caml_debug.so
-Index: apron/apron/products/Makefile
-===================================================================
---- apron.orig/apron/products/Makefile 2009-10-29 21:39:24.000000000 +0100
-+++ apron/apron/products/Makefile      2009-10-29 21:40:02.000000000 +0100
-@@ -48,7 +48,10 @@
+diff --git a/apron/products/Makefile b/apron/products/Makefile
+index 0b3bf3b..bbec4a3 100644
+--- a/apron/products/Makefile
++++ b/apron/products/Makefile
+@@ -48,7 +48,10 @@ ifneq ($(HAS_SHARED),)
  all: libap_pkgrid.so libap_pkgrid_debug.so
  endif
  
@@ -173,3 +172,21 @@ Index: apron/apron/products/Makefile
  ifneq ($(HAS_SHARED),)
  ml: libpolkaGrid_caml.so libpolkaGrid_caml_debug.so dllpolkaGrid_caml.so 
dllpolkaGrid_caml_debug.so
  endif
+diff --git a/mlgmpidl/Makefile b/mlgmpidl/Makefile
+index 60f78ed..0edca18 100644
+--- a/mlgmpidl/Makefile
++++ b/mlgmpidl/Makefile
+@@ -83,7 +83,11 @@ CCINC_TOINSTALL = gmp_caml.h
+ # Rules
+ #---------------------------------------
+ 
+-all: $(MLSRC) $(MLINT) $(MLOBJ) $(MLOBJx) gmp.cma gmp.cmxa libgmp_caml.a
++all: $(MLSRC) $(MLINT) $(MLOBJ) gmp.cma libgmp_caml.a
++
++ifeq ($(OCAML_BEST),opt)
++all: $(MLOBJx) gmp.cmxa
++endif
+ 
+ ifneq ($(HAS_SHARED),)
+ all: libgmp_caml.so
+-- 
diff --git a/debian/patches/link 
b/debian/patches/0004-Patch-in-order-to-resolve-symbols.patch
similarity index 62%
rename from debian/patches/link
rename to debian/patches/0004-Patch-in-order-to-resolve-symbols.patch
index 6538d37..219201a 100644
--- a/debian/patches/link
+++ b/debian/patches/0004-Patch-in-order-to-resolve-symbols.patch
@@ -1,8 +1,23 @@
-Index: apron/apron/apron/Makefile
-===================================================================
---- apron.orig/apron/apron/Makefile    2009-12-06 15:00:18.000000000 +0100
-+++ apron/apron/apron/Makefile 2009-12-06 15:00:18.000000000 +0100
-@@ -133,7 +133,7 @@
+From: Samuel Mimram <smim...@debian.org>
+Date: Wed, 25 Dec 2013 12:31:52 +0100
+Subject: Patch in order to resolve symbols
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558838
+Last-Update: 2009-12-06
+---
+ apron/apron/Makefile    | 2 +-
+ apron/box/Makefile      | 2 +-
+ apron/newpolka/Makefile | 2 +-
+ apron/octagons/Makefile | 2 +-
+ apron/ppl/Makefile      | 4 ++--
+ apron/products/Makefile | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/apron/apron/Makefile b/apron/apron/Makefile
+index e272685..3ccf0d5 100644
+--- a/apron/apron/Makefile
++++ b/apron/apron/Makefile
+@@ -133,7 +133,7 @@ libapron_debug.a: $(C_FILES:%.c=%_debug.o) 
$(C_FILES_AUX:%.c=%MPQ_debug.o) $(C_F
  
  libapron.so: $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) 
$(C_FILES_AUX:%.c=%D.o)  $(C_FILES_AUX:%.c=%MPFR.o) ../itv/libitv.a
        for i in `$(AR) t ../itv/libitv.a`; do ln -s ../itv/$$i $$i; done
@@ -11,11 +26,11 @@ Index: apron/apron/apron/Makefile
        for i in `$(AR) t ../itv/libitv.a`; do $(RM) $$i; done
  
  libapron_debug.so: $(C_FILES:%.c=%_debug.o) $(C_FILES_AUX:%.c=%MPQ_debug.o) 
$(C_FILES_AUX:%.c=%D_debug.o) $(C_FILES_AUX:%.c=%MPFR_debug.o) 
../itv/libitv_debug.a
-Index: apron/apron/box/Makefile
-===================================================================
---- apron.orig/apron/box/Makefile      2009-12-06 15:00:18.000000000 +0100
-+++ apron/apron/box/Makefile   2009-12-06 15:04:33.000000000 +0100
-@@ -151,7 +151,7 @@
+diff --git a/apron/box/Makefile b/apron/box/Makefile
+index 2f51414..63c7bea 100644
+--- a/apron/box/Makefile
++++ b/apron/box/Makefile
+@@ -151,7 +151,7 @@ libbox%_debug.a: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libbox%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
@@ -24,11 +39,11 @@ Index: apron/apron/box/Makefile
  libbox%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
        $(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
  
-Index: apron/apron/newpolka/Makefile
-===================================================================
---- apron.orig/apron/newpolka/Makefile 2009-12-06 15:00:18.000000000 +0100
-+++ apron/apron/newpolka/Makefile      2009-12-06 15:03:49.000000000 +0100
-@@ -176,7 +176,7 @@
+diff --git a/apron/newpolka/Makefile b/apron/newpolka/Makefile
+index d7a2ab4..dc65817 100644
+--- a/apron/newpolka/Makefile
++++ b/apron/newpolka/Makefile
+@@ -176,7 +176,7 @@ libpolka%_debug.a: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libpolka%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
@@ -37,11 +52,11 @@ Index: apron/apron/newpolka/Makefile
  libpolka%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
        $(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
  
-Index: apron/apron/octagons/Makefile
-===================================================================
---- apron.orig/apron/octagons/Makefile 2009-12-06 15:00:18.000000000 +0100
-+++ apron/apron/octagons/Makefile      2009-12-06 15:05:19.000000000 +0100
-@@ -174,7 +174,7 @@
+diff --git a/apron/octagons/Makefile b/apron/octagons/Makefile
+index 2341648..8251f0b 100644
+--- a/apron/octagons/Makefile
++++ b/apron/octagons/Makefile
+@@ -174,7 +174,7 @@ liboct%_debug.a: $(subst .c,%_debug.o,$(CCSOURCES))
        $(RANLIB) $@
  
  liboct%.so: $(subst .c,%.o,$(CCSOURCES))
@@ -50,11 +65,11 @@ Index: apron/apron/octagons/Makefile
  
  octtest%: liboct%_debug.a oct_test%.o
        $(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ oct_test$*.o \
-Index: apron/apron/ppl/Makefile
-===================================================================
---- apron.orig/apron/ppl/Makefile      2009-12-06 15:00:18.000000000 +0100
-+++ apron/apron/ppl/Makefile   2009-12-06 15:10:51.000000000 +0100
-@@ -126,7 +126,7 @@
+diff --git a/apron/ppl/Makefile b/apron/ppl/Makefile
+index 4551316..df1caa0 100644
+--- a/apron/ppl/Makefile
++++ b/apron/ppl/Makefile
+@@ -126,7 +126,7 @@ libap_ppl_debug.a: $(subst .cc,_debug.o,$(CXXSOURCES))
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES))
@@ -63,7 +78,7 @@ Index: apron/apron/ppl/Makefile
  libap_ppl_debug.so: $(subst .cc,_debug.o,$(CXXSOURCES))
        $(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^ -lppl 
-lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
  
-@@ -181,7 +181,7 @@
+@@ -181,7 +181,7 @@ libap_ppl_caml_debug.a: ap_ppl_caml_debug.o
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libap_ppl_caml.so: ap_ppl_caml.o libap_ppl.so
@@ -72,11 +87,11 @@ Index: apron/apron/ppl/Makefile
  libap_ppl_caml_debug.so: ap_ppl_caml_debug.o libap_ppl_debug.so
        $(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl_debug -lppl -lgmpxx -L. 
-L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
  dllap_ppl_caml.so: libap_ppl_caml.so
-Index: apron/apron/products/Makefile
-===================================================================
---- apron.orig/apron/products/Makefile 2009-12-06 15:00:18.000000000 +0100
-+++ apron/apron/products/Makefile      2009-12-06 15:13:48.000000000 +0100
-@@ -109,7 +109,7 @@
+diff --git a/apron/products/Makefile b/apron/products/Makefile
+index bbec4a3..8f07548 100644
+--- a/apron/products/Makefile
++++ b/apron/products/Makefile
+@@ -109,7 +109,7 @@ libap_pkgrid_debug.a: ap_pkgrid_debug.o
        $(AR) rcs $@ $^
        $(RANLIB) $@
  libap_pkgrid.so: ap_pkgrid.o
@@ -85,3 +100,4 @@ Index: apron/apron/products/Makefile
  libap_pkgrid_debug.so: ap_pkgrid_debug.o
        $(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
  
+-- 
diff --git a/debian/patches/0005-Install-oct-.a.patch 
b/debian/patches/0005-Install-oct-.a.patch
new file mode 100644
index 0000000..ed26535
--- /dev/null
+++ b/debian/patches/0005-Install-oct-.a.patch
@@ -0,0 +1,23 @@
+From: Samuel Mimram <smim...@debian.org>
+Date: Wed, 25 Dec 2013 12:32:10 +0100
+Subject: Install oct*.a
+
+Last-Update: 2010-01-17
+---
+ apron/octagons/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apron/octagons/Makefile b/apron/octagons/Makefile
+index 8251f0b..fd9b6d8 100644
+--- a/apron/octagons/Makefile
++++ b/apron/octagons/Makefile
+@@ -138,7 +138,7 @@ install:
+       for i in octtest?? octtop?? octrun??; do \
+               if test -f $$i; then $(INSTALL) $$i $(BINDIR); fi; \
+       done
+-      for i in oct.mli oct.cmi oct.cmx oct*.cma oct*.cmxa oct.a; do \
++      for i in oct.mli oct.cmi oct.cmx oct*.cma oct*.cmxa oct*.a; do \
+               if test -f $$i; then $(INSTALL) $$i $(LIBDIR); fi; \
+       done
+ 
+-- 
diff --git a/debian/patches/mpfr_random.diff 
b/debian/patches/0006-Remove-references-to-obsolete-mpfr_random.patch
similarity index 87%
rename from debian/patches/mpfr_random.diff
rename to debian/patches/0006-Remove-references-to-obsolete-mpfr_random.patch
index a8a98c0..73e86cb 100644
--- a/debian/patches/mpfr_random.diff
+++ b/debian/patches/0006-Remove-references-to-obsolete-mpfr_random.patch
@@ -1,20 +1,19 @@
-From 481f69dd75fa51ff714f0956df1a4fe09c12684d Mon Sep 17 00:00:00 2001
 From: Stephane Glondu <st...@glondu.net>
 Date: Sat, 17 Jul 2010 11:22:38 +0200
-Subject: [PATCH] Remove references to obsolete mpfr_random
+Subject: Remove references to obsolete mpfr_random
 
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589359
 Signed-off-by: Stephane Glondu <st...@glondu.net>
 ---
- mlgmpidl/gmp_random.idl         |    1 -
- mlgmpidl/gmp_random.ml          |    3 ---
- mlgmpidl/gmp_random.mli         |    3 ---
- mlgmpidl/gmp_random_caml.c      |   13 -------------
- mlgmpidl/tmp/gmp_random.idl     |    1 -
- mlgmpidl/tmp/gmp_random.ml      |    3 ---
- mlgmpidl/tmp/gmp_random.mli     |    3 ---
- mlgmpidl/tmp/gmp_random_stubs.c |   13 -------------
- 8 files changed, 0 insertions(+), 40 deletions(-)
+ mlgmpidl/gmp_random.idl         |  1 -
+ mlgmpidl/gmp_random.ml          |  3 ---
+ mlgmpidl/gmp_random.mli         |  3 ---
+ mlgmpidl/gmp_random_caml.c      | 13 -------------
+ mlgmpidl/tmp/gmp_random.idl     |  1 -
+ mlgmpidl/tmp/gmp_random.ml      |  3 ---
+ mlgmpidl/tmp/gmp_random.mli     |  3 ---
+ mlgmpidl/tmp/gmp_random_stubs.c | 13 -------------
+ 8 files changed, 40 deletions(-)
 
 diff --git a/mlgmpidl/gmp_random.idl b/mlgmpidl/gmp_random.idl
 index da3cb0c..90d5793 100644
@@ -133,5 +132,3 @@ index 8ea5041..5c8ce74 100644
 -}
 -
 -- 
-1.7.1
-
diff --git a/debian/patches/rounding_modes.diff 
b/debian/patches/0007-Fix-rounding-mode-check-in-assert.patch
similarity index 83%
rename from debian/patches/rounding_modes.diff
rename to debian/patches/0007-Fix-rounding-mode-check-in-assert.patch
index a1ab9ff..7a3d087 100644
--- a/debian/patches/rounding_modes.diff
+++ b/debian/patches/0007-Fix-rounding-mode-check-in-assert.patch
@@ -1,13 +1,12 @@
-From f1c6209c44883343b05ad625d5d97d90f8a322cd Mon Sep 17 00:00:00 2001
 From: Laurent Fousse <laur...@komite.net>
 Date: Mon, 19 Jul 2010 10:57:25 +0200
-Subject: [PATCH] Fix rounding mode check in assert.
+Subject: Fix rounding mode check in assert.
 
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589359
 Signed-off-by: Stephane Glondu <st...@glondu.net>
 ---
- mlgmpidl/gmp_caml.h |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ mlgmpidl/gmp_caml.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/mlgmpidl/gmp_caml.h b/mlgmpidl/gmp_caml.h
 index 15ca41c..0b3468a 100644
@@ -31,5 +30,3 @@ index 15ca41c..0b3468a 100644
  #endif
  
 -- 
-1.7.1
-
diff --git a/debian/patches/oct_static b/debian/patches/oct_static
deleted file mode 100644
index 05c7deb..0000000
--- a/debian/patches/oct_static
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: apron/apron/octagons/Makefile
-===================================================================
---- apron.orig/apron/octagons/Makefile 2010-01-17 14:45:44.000000000 +0100
-+++ apron/apron/octagons/Makefile      2010-01-17 14:45:53.000000000 +0100
-@@ -138,7 +138,7 @@
-       for i in octtest?? octtop?? octrun??; do \
-               if test -f $$i; then $(INSTALL) $$i $(BINDIR); fi; \
-       done
--      for i in oct.mli oct.cmi oct.cmx oct*.cma oct*.cmxa oct.a; do \
-+      for i in oct.mli oct.cmi oct.cmx oct*.cma oct*.cmxa oct*.a; do \
-               if test -f $$i; then $(INSTALL) $$i $(LIBDIR); fi; \
-       done
- 
diff --git a/debian/patches/series b/debian/patches/series
index d7e9407..dacdfa3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
-rpath.diff
-soname.diff
-nonopt.diff
-link
-oct_static
-mpfr_random.diff
-rounding_modes.diff
+0001-Remove-rpaths.patch
+0002-Add-sonames.patch
+0003-Patch-in-order-to-be-able-to-build-on-non-native-arc.patch
+0004-Patch-in-order-to-resolve-symbols.patch
+0005-Install-oct-.a.patch
+0006-Remove-references-to-obsolete-mpfr_random.patch
+0007-Fix-rounding-mode-check-in-assert.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/apron.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

Reply via email to