From 38b3e9601f5056b092ebf91a3c5d1840c667d06f Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 13 Jun 2012 10:09:06 +0200 Subject: [PATCH] Refresh patches --- .../0001-Pass-no-relax-to-ld-on-alpha.patch | 6 +- .../0002-Call-ld-with-proper-flags.patch | 4 +- debian/patches/0003-Don-t-use-rpath.patch | 2 +- ...-manpages-in-section-3o-instead-of-3.patch | 4 +- ...005-Patch-config.sh-for-installation.patch | 4 +- ...ld-as-a-link-on-either-.native-or-.b.patch | 2 +- ...nlink-works-on-powerpc-and-hurd-i386.patch | 6 +- ...e-primitive-name-table-as-const-char.patch | 2 +- ...eclarations-in-generated-.c-files-in.patch | 8 +- ...ize-executable-name-in-caml_startup_.patch | 2 +- ...tecode-in-C-object-when-using-custom.patch | 8 +- .../0012-Fix-asmcomp-tests-on-Hurd.patch | 2 +- ...-changes-in-otherlibs-graph-.depends.patch | 177 ------------------ debian/patches/series | 1 - 14 files changed, 25 insertions(+), 203 deletions(-) delete mode 100644 debian/patches/0013-Revert-recent-changes-in-otherlibs-graph-.depends.patch 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 abcd7647..cb527398 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 @@ -9,10 +9,10 @@ code (bug#338437) 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 4ed6ce1..c632d6d 100755 +index 72f4240..cbb6491 100755 --- a/configure +++ b/configure -@@ -298,7 +298,8 @@ case "$bytecc,$host" in +@@ -299,7 +299,8 @@ case "$bytecc,$host" in gcc,alpha*-*-linux*) if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; @@ -22,7 +22,7 @@ index 4ed6ce1..c632d6d 100755 cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" -@@ -731,6 +732,7 @@ case "$arch,$nativecc,$system,$host_type" in +@@ -733,6 +734,7 @@ case "$arch,$nativecc,$system,$host_type" in nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" if $arch64; then partialld="ld -r -arch ppc64"; fi;; diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch index c2d01cba..3444c14d 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -10,10 +10,10 @@ gcc. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index c632d6d..9c1bb8c 100755 +index cbb6491..afca5b0 100755 --- a/configure +++ b/configure -@@ -1613,7 +1613,7 @@ echo "DEBUGGER=$debugger" >> Makefile +@@ -1615,7 +1615,7 @@ echo "DEBUGGER=$debugger" >> Makefile echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index 3c90a170..a8c4a575 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -7,7 +7,7 @@ Subject: Don't use rpath 1 file changed, 5 insertions(+) diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp -index 3b31201..8846fd0 100644 +index f114b13..d3f359d 100644 --- a/tools/ocamlmklib.mlp +++ b/tools/ocamlmklib.mlp @@ -37,6 +37,11 @@ and output_c = ref "" (* Output name for C part of library *) 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 10f530fe..70896f66 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 @@ -7,10 +7,10 @@ Subject: Put manpages in section 3o instead of 3 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index d04809a..f8cb482 100644 +index b9dd690..679973b 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile -@@ -333,7 +333,7 @@ test_texi: dummy +@@ -342,7 +342,7 @@ test_texi: dummy stdlib_man/Pervasives.3o: $(STDLIB_MLIS) $(MKDIR) stdlib_man $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \ diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch index 69c8aa08..246da814 100644 --- a/debian/patches/0005-Patch-config.sh-for-installation.patch +++ b/debian/patches/0005-Patch-config.sh-for-installation.patch @@ -9,7 +9,7 @@ Use for installatation a patched config.sh (created by debian/rules). 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/install.sh b/build/install.sh -index c0ad62f..62d71d6 100755 +index df01db4..546d65a 100755 --- a/build/install.sh +++ b/build/install.sh @@ -18,7 +18,7 @@ set -e @@ -22,7 +22,7 @@ index c0ad62f..62d71d6 100755 not_installed=$PWD/_build/not_installed diff --git a/build/partial-install.sh b/build/partial-install.sh -index 81c0e11..61cce5b 100755 +index a8113c9..15071d4 100755 --- a/build/partial-install.sh +++ b/build/partial-install.sh @@ -22,7 +22,7 @@ set -e 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 048ab321..0641f820 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 @@ -7,7 +7,7 @@ Subject: Install ocamlbuild as a link on either .native or .byte 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/partial-install.sh b/build/partial-install.sh -index 61cce5b..73eda48 100755 +index 15071d4..8170706 100755 --- a/build/partial-install.sh +++ b/build/partial-install.sh @@ -60,6 +60,21 @@ installbestbin() { 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 abbf6088..d446364d 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 @@ -15,10 +15,10 @@ Signed-off-by: Stephane Glondu 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index 9c1bb8c..a53f251 100755 +index afca5b0..e1d32dd 100755 --- a/configure +++ b/configure -@@ -628,6 +628,7 @@ if test $withsharedlibs = "yes"; then +@@ -630,6 +630,7 @@ if test $withsharedlibs = "yes"; then case "$host" in *-*-cygwin*) natdynlink=true;; i[3456]86-*-linux*) natdynlink=true;; @@ -26,7 +26,7 @@ index 9c1bb8c..a53f251 100755 x86_64-*-linux*) natdynlink=true;; i[3456]86-*-darwin[89].*) natdynlink=true;; i[3456]86-*-darwin*) -@@ -636,6 +637,7 @@ if test $withsharedlibs = "yes"; then +@@ -638,6 +639,7 @@ if test $withsharedlibs = "yes"; then fi;; x86_64-*-darwin*) natdynlink=true;; powerpc64-*-linux*) natdynlink=true;; 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 fbfd2ec9..b8afc8f0 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 @@ -11,7 +11,7 @@ Signed-off-by: Stephane Glondu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml -index 4e5f147..0785316 100644 +index 872a4bb..60c884e 100644 --- a/bytecomp/symtable.ml +++ b/bytecomp/symtable.ml @@ -126,7 +126,7 @@ let output_primitive_table outchan = diff --git a/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch index 2052b8fc..df1e5c70 100644 --- a/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch +++ b/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch @@ -19,7 +19,7 @@ Signed-off-by: Stephane Glondu 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml -index 9bc5790..8f797a1 100644 +index f40e425..bb14de6 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml @@ -408,6 +408,19 @@ let output_cds_file outfile = @@ -51,7 +51,7 @@ index 9bc5790..8f797a1 100644 (* The entry point *) output_string outchan "\ \nvoid caml_startup(char ** argv)\ -@@ -529,7 +542,7 @@ let link ppf objfiles output_name = +@@ -530,7 +543,7 @@ let link ppf objfiles output_name = #else\n\ typedef long value;\n\ #endif\n"; @@ -61,7 +61,7 @@ index 9bc5790..8f797a1 100644 #ifdef __cplusplus\n\ }\n\ diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml -index 0785316..b70944c 100644 +index 60c884e..08af10f 100644 --- a/bytecomp/symtable.ml +++ b/bytecomp/symtable.ml @@ -115,15 +115,17 @@ let output_primitive_names outchan = @@ -86,7 +86,7 @@ index 0785316..b70944c 100644 fprintf outchan " (primitive) 0 };\n"; fprintf outchan "const char * caml_names_of_builtin_cprim[] = {\n"; diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli -index d9a2be3..25bd62d 100644 +index b4268f4..22dfebc 100644 --- a/bytecomp/symtable.mli +++ b/bytecomp/symtable.mli @@ -24,7 +24,7 @@ val require_primitive: string -> unit 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 d6aae88b..2eee7f71 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 @@ -10,7 +10,7 @@ Signed-off-by: Stephane Glondu 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/byterun/startup.c b/byterun/startup.c -index feb5029..6fdba16 100644 +index 5f35e87..6d7d2a6 100644 --- a/byterun/startup.c +++ b/byterun/startup.c @@ -443,6 +443,10 @@ CAMLexport void caml_startup_code( diff --git a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch index aedb4436..e737fb27 100644 --- a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch +++ b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch @@ -16,7 +16,7 @@ Signed-off-by: Stephane Glondu 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml -index 8f797a1..1de0a79 100644 +index bb14de6..ec02825 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml @@ -423,7 +423,7 @@ let mlvalues_primitives = [ @@ -58,7 +58,7 @@ index 8f797a1..1de0a79 100644 \n#ifdef __cplusplus\ \n}\ \n#endif\n"; -@@ -510,6 +523,11 @@ let fix_exec_name name = +@@ -511,6 +524,11 @@ let fix_exec_name name = if String.contains name '.' then name else name ^ ".exe" | _ -> name @@ -70,7 +70,7 @@ index 8f797a1..1de0a79 100644 (* Main entry point (build a custom runtime if needed) *) let link ppf objfiles output_name = -@@ -523,6 +541,16 @@ let link ppf objfiles output_name = +@@ -524,6 +542,16 @@ let link ppf objfiles output_name = Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *) if not !Clflags.custom_runtime then link_bytecode ppf tolink output_name true @@ -87,7 +87,7 @@ index 8f797a1..1de0a79 100644 else if not !Clflags.output_c_object then begin let bytecode_name = Filename.temp_file "camlcode" "" in let prim_name = Filename.temp_file "camlprim" ".c" in -@@ -565,7 +593,7 @@ let link ppf objfiles output_name = +@@ -566,7 +594,7 @@ let link ppf objfiles output_name = if Sys.file_exists c_file then raise(Error(File_exists c_file)); let temps = ref [] in try diff --git a/debian/patches/0012-Fix-asmcomp-tests-on-Hurd.patch b/debian/patches/0012-Fix-asmcomp-tests-on-Hurd.patch index 1a9b6235..4831499b 100644 --- a/debian/patches/0012-Fix-asmcomp-tests-on-Hurd.patch +++ b/debian/patches/0012-Fix-asmcomp-tests-on-Hurd.patch @@ -10,7 +10,7 @@ Signed-off-by: Stephane Glondu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/tests/asmcomp/i386.S b/testsuite/tests/asmcomp/i386.S -index fc75b1f..cb78db8 100644 +index fdda4de..54e37a6 100644 --- a/testsuite/tests/asmcomp/i386.S +++ b/testsuite/tests/asmcomp/i386.S @@ -15,7 +15,7 @@ diff --git a/debian/patches/0013-Revert-recent-changes-in-otherlibs-graph-.depends.patch b/debian/patches/0013-Revert-recent-changes-in-otherlibs-graph-.depends.patch deleted file mode 100644 index 6d5faf9f..00000000 --- a/debian/patches/0013-Revert-recent-changes-in-otherlibs-graph-.depends.patch +++ /dev/null @@ -1,177 +0,0 @@ -From: Stephane Glondu -Date: Thu, 12 Apr 2012 09:06:52 +0200 -Subject: Revert recent changes in otherlibs/graph/.depends - -Bug: http://caml.inria.fr/mantis/view.php?id=5582 -Signed-off-by: Stephane Glondu ---- - otherlibs/graph/.depend | 110 +++++++++++++++++++++++------------------------ - 1 file changed, 55 insertions(+), 55 deletions(-) - -diff --git a/otherlibs/graph/.depend b/otherlibs/graph/.depend -index f72f26b..54df069 100644 ---- a/otherlibs/graph/.depend -+++ b/otherlibs/graph/.depend -@@ -1,106 +1,106 @@ --color.o: color.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+color.o: color.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h \ -- /opt/local/include/X11/Xatom.h --draw.o: draw.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+ -+draw.o: draw.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \ - ../../byterun/mlvalues.h --dump_img.o: dump_img.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+dump_img.o: dump_img.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h image.h \ - ../../byterun/alloc.h ../../byterun/mlvalues.h ../../byterun/memory.h \ - ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \ - ../../byterun/minor_gc.h --events.o: events.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+events.o: events.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \ - ../../byterun/mlvalues.h ../../byterun/signals.h --fill.o: fill.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+fill.o: fill.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \ - ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \ - ../../byterun/freelist.h ../../byterun/minor_gc.h --image.o: image.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+image.o: image.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h image.h \ - ../../byterun/alloc.h ../../byterun/mlvalues.h ../../byterun/custom.h --make_img.o: make_img.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+make_img.o: make_img.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h image.h \ - ../../byterun/memory.h ../../byterun/gc.h ../../byterun/mlvalues.h \ - ../../byterun/major_gc.h ../../byterun/freelist.h \ - ../../byterun/minor_gc.h --open.o: open.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+open.o: open.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \ - ../../byterun/mlvalues.h ../../byterun/callback.h ../../byterun/fail.h \ - ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \ - ../../byterun/freelist.h ../../byterun/minor_gc.h --point_col.o: point_col.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+point_col.o: point_col.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h --sound.o: sound.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+sound.o: sound.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h --subwindow.o: subwindow.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+subwindow.o: subwindow.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h --text.o: text.c libgraph.h /opt/local/include/X11/Xlib.h \ -- /opt/local/include/X11/X.h /opt/local/include/X11/Xfuncproto.h \ -- /opt/local/include/X11/Xosdefs.h /opt/local/include/X11/Xutil.h \ -- /opt/local/include/X11/keysym.h /opt/local/include/X11/keysymdef.h \ -+text.o: text.c libgraph.h \ -+ \ -+ \ -+ \ - ../../byterun/mlvalues.h ../../byterun/compatibility.h \ - ../../byterun/config.h ../../byterun/../config/m.h \ - ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \ - ../../byterun/mlvalues.h --graphics.cmi : --graphicsX11.cmi : --graphics.cmo : graphics.cmi --graphics.cmx : graphics.cmi --graphicsX11.cmo : graphics.cmi graphicsX11.cmi --graphicsX11.cmx : graphics.cmx graphicsX11.cmi -+graphics.cmi: -+graphicsX11.cmi: -+graphics.cmo: graphics.cmi -+graphics.cmx: graphics.cmi -+graphicsX11.cmo: graphics.cmi graphicsX11.cmi -+graphicsX11.cmx: graphics.cmx graphicsX11.cmi --- diff --git a/debian/patches/series b/debian/patches/series index bf849fe4..7d15357f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,3 @@ 0010-Properly-initialize-executable-name-in-caml_startup_.patch 0011-Embed-bytecode-in-C-object-when-using-custom.patch 0012-Fix-asmcomp-tests-on-Hurd.patch -0013-Revert-recent-changes-in-otherlibs-graph-.depends.patch -- 2.30.2