The following commit has been merged in the master branch: commit 9c21b7b26679c2901a9ff3b5016e676221e49174 Author: Stephane Glondu <st...@glondu.net> Date: Tue Jun 26 07:25:32 2012 +0200
Refresh patches diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch index 3d05dfc..2bdbc74 100644 --- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch +++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch @@ -6,7 +6,7 @@ Pass the --no-relax option to ld to fix a segfault in initialization code (bug#338437) --- configure | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9be5199..236e016 100755 diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch index e1b4754..b200887 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -7,7 +7,7 @@ to remove the "-Wl," parts, which are only used when ocamlopt calls gcc. --- configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 236e016..d4287ed 100755 diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index 83a5f55..b293733 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -4,7 +4,7 @@ Subject: Don't use rpath --- tools/ocamlmklib.mlp | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp index 8374439..b8d9e33 100644 diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch index 7231e22..b43738f 100644 --- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch +++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch @@ -4,7 +4,7 @@ Subject: Put manpages in section 3o instead of 3 --- ocamldoc/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile index 8f6e87c..ace934c 100644 diff --git a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch index cac2084..a7d1559 100644 --- a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch +++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch @@ -4,7 +4,7 @@ Subject: Install ocamlbuild as a link on either .native or .byte --- build/partial-install.sh | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) + 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/partial-install.sh b/build/partial-install.sh index 8e4fbd2..ca66bc1 100755 diff --git a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch index 739217d..d3f4d13 100644 --- a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch +++ b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch @@ -12,7 +12,7 @@ Bug: http://caml.inria.fr/mantis/view.php?id=5255 Signed-off-by: Stephane Glondu <st...@glondu.net> --- configure | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index d4287ed..d6ba2e3 100755 diff --git a/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch b/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch index c9a8ede..2099078 100644 --- a/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch +++ b/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch @@ -8,7 +8,7 @@ Bug: http://caml.inria.fr/mantis/view.php?id=5131 Signed-off-by: Stephane Glondu <st...@glondu.net> --- bytecomp/symtable.ml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml index d6ecc94..37def29 100644 diff --git a/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch b/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch index fdfc3db..fdb9c0b 100644 --- a/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch +++ b/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch @@ -7,7 +7,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627756 Signed-off-by: Stephane Glondu <st...@glondu.net> --- byterun/startup.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) + 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/byterun/startup.c b/byterun/startup.c index db273b2..780cb1e 100644 diff --git a/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch b/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch index 1832412..8af14a0 100644 --- a/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch +++ b/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch @@ -8,7 +8,7 @@ Subject: Make objinfo show force_link and ccobjs/ccopts when needed Forwarded: http://caml.inria.fr/mantis/view.php?id=5316 --- tools/objinfo.ml | 25 +++++++++++++++++++++---- - 1 files changed, 21 insertions(+), 4 deletions(-) + 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/tools/objinfo.ml b/tools/objinfo.ml index 4f467f2..b75b83a 100644 diff --git a/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch b/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch index a4c0491..a616a22 100644 --- a/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch +++ b/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch @@ -8,7 +8,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net> --- asmcomp/arm/emit.mlp | 1 + asmrun/arm.S | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) + 2 files changed, 13 insertions(+) diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp index 2003313..a4b2241 100644 diff --git a/debian/patches/0014-Add-support-for-ENOTSUP.patch b/debian/patches/0014-Add-support-for-ENOTSUP.patch index e2f031f..e318648 100644 --- a/debian/patches/0014-Add-support-for-ENOTSUP.patch +++ b/debian/patches/0014-Add-support-for-ENOTSUP.patch @@ -15,7 +15,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646372 Signed-off-by: Stephane Glondu <st...@glondu.net> --- otherlibs/unix/unixsupport.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) + 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/otherlibs/unix/unixsupport.c b/otherlibs/unix/unixsupport.c index a471f9e..db5912e 100644 diff --git a/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch index 4c29883..2671b57 100644 --- a/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch +++ b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch @@ -6,7 +6,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net> Bug: http://caml.inria.fr/mantis/view.php?id=5393 --- configure | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index d6ba2e3..20b4b17 100755 -- OCaml 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