[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.0-5-14-g4e33058
Stephane Glondu
steph at glondu.net
Tue May 19 16:08:40 UTC 2009
The following commit has been merged in the master branch:
commit 4e330583625d30f2345d388f786a122f1020c3ca
Author: Stephane Glondu <steph at glondu.net>
Date: Tue May 19 17:42:52 2009 +0200
New upstream release candidate
diff --git a/debian/changelog b/debian/changelog
index 71dc9d9..5e51b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocaml (3.11.0-6) UNRELEASED; urgency=low
+ocaml (3.11.1~rc0-1) UNRELEASED; urgency=low
[ Samuel Mimram ]
* Add kfreebsd-amd64 to the list of supported native architectures.
@@ -12,7 +12,12 @@ ocaml (3.11.0-6) UNRELEASED; urgency=low
- add new patch ocamldoc_natdynlink (from upstream): enable
dynamic loading of ocamldoc custom printers also for ocamldoc.opt
- -- Samuel Mimram <smimram at debian.org> Mon, 16 Mar 2009 15:07:00 +0100
+ [ Stephane Glondu ]
+ * New upstream release candidate:
+ - remove dbm_ldopts.dpatch (merged upstream)
+ - switch patch system to quilt
+
+ -- Stephane Glondu <steph at glondu.net> Tue, 19 May 2009 17:41:47 +0200
ocaml (3.11.0-5) unstable; urgency=low
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 11ee307..ef231d0 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,7 +9,7 @@ code (bug#338437)
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
-index 503f555..eba3528 100755
+index e736a92..9028530 100755
--- a/configure
+++ b/configure
@@ -282,7 +282,8 @@ case "$bytecc,$host" in
@@ -22,14 +22,14 @@ index 503f555..eba3528 100755
cc,mips-*-irix6*)
# Add -n32 flag to ensure compatibility with native-code compiler
bytecccompopts="-n32"
-@@ -684,6 +685,7 @@ case "$arch,$nativecc,$system,$host_type" in
+@@ -693,6 +694,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;;
+ alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";;
*,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";;
amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
- *,gcc*,*,*) nativecccompopts="$gcc_warnings";;
+ amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
--
1.6.2.4
diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch
index d6fdd43..6635dbd 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 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
-index eba3528..be13adc 100755
+index 9028530..156c72a 100755
--- a/configure
+++ b/configure
-@@ -1548,7 +1548,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1560,7 +1560,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/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
index 56d1193..7b99188 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: [PATCH] Put manpages in section 3o instead of 3
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
-index 0878a79..f53046c 100644
+index 66f9fdd..45476ec 100644
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
-@@ -318,7 +318,7 @@ test_texi: dummy
+@@ -319,7 +319,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-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch b/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch
index 2bb7912..9403dd4 100644
--- a/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch
+++ b/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch
@@ -6,13 +6,8 @@ That enables using ocamldoc flags such as "-g" also with
ocamldoc.opt. Patch is taken from OCaml CVS and is already
integrated upstream for future releases.
---
- man/ocamldoc.m | 5 +----
- ocamldoc/Makefile | 29 +++++++++++++++--------------
- ocamldoc/odoc.ml | 18 +++++++++---------
- ocamldoc/odoc_args.ml | 8 ++------
- ocamldoc/odoc_args.mli | 4 ----
- ocamldoc/odoc_messages.ml | 5 ++---
- 6 files changed, 29 insertions(+), 40 deletions(-)
+ man/ocamldoc.m | 5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/man/ocamldoc.m b/man/ocamldoc.m
index 5d1ed6a..757ec58 100644
@@ -30,169 +25,6 @@ index 5d1ed6a..757ec58 100644
If the given file is a simple one and does not exist in
the current directory, then ocamldoc looks for it in the custom
generators default directory, and in the directories specified with the
-diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
-index f53046c..a3cf8fa 100644
---- a/ocamldoc/Makefile
-+++ b/ocamldoc/Makefile
-@@ -111,16 +111,17 @@ CMOFILES= odoc_config.cmo \
- CMXFILES= $(CMOFILES:.cmo=.cmx)
- CMIFILES= $(CMOFILES:.cmo=.cmi)
-
--EXECMOFILES=$(CMOFILES)\
-- odoc_dag2html.cmo\
-- odoc_to_text.cmo\
-- odoc_ocamlhtml.cmo\
-- odoc_html.cmo\
-- odoc_man.cmo\
-+EXECMOFILES=$(CMOFILES) \
-+ odoc_dag2html.cmo \
-+ odoc_to_text.cmo \
-+ odoc_ocamlhtml.cmo \
-+ odoc_html.cmo \
-+ odoc_man.cmo \
- odoc_latex_style.cmo \
-- odoc_latex.cmo\
-- odoc_texi.cmo\
-- odoc_dot.cmo
-+ odoc_latex.cmo \
-+ odoc_texi.cmo \
-+ odoc_dot.cmo \
-+ odoc.cmo
-
- EXECMXFILES= $(EXECMOFILES:.cmo=.cmx)
- EXECMIFILES= $(EXECMOFILES:.cmo=.cmi)
-@@ -199,10 +200,10 @@ libopt: $(OCAMLDOC_LIBCMXA) $(OCAMLDOC_LIBCMI)
- debug:
- make OCAMLPP=""
-
--$(OCAMLDOC): $(EXECMOFILES) odoc.cmo
-- $(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES) odoc.cmo
--$(OCAMLDOC_OPT): $(EXECMXFILES) odoc_opt.cmx
-- $(OCAMLOPT) -o $@ unix.cmxa str.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES) odoc_opt.cmx
-+$(OCAMLDOC): $(EXECMOFILES)
-+ $(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES)
-+$(OCAMLDOC_OPT): $(EXECMXFILES)
-+ $(OCAMLOPT) -o $@ unix.cmxa str.cmxa dynlink.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)
-
- $(OCAMLDOC_LIBCMA): $(LIBCMOFILES)
- $(OCAMLC) -a -o $@ $(LINKFLAGS) $(OCAMLCMOFILES) $(LIBCMOFILES)
-@@ -211,7 +212,7 @@ $(OCAMLDOC_LIBCMXA): $(LIBCMXFILES)
-
- manpages: stdlib_man/Pervasives.3o
-
--dot: $(EXECMOFILES) odoc.cmo
-+dot: $(EXECMOFILES)
- $(OCAMLDOC_RUN) -dot -dot-reduce -o ocamldoc.dot $(INCLUDES) \
- odoc*.ml
-
-diff --git a/ocamldoc/odoc.ml b/ocamldoc/odoc.ml
-index 472e93b..14ef26c 100644
---- a/ocamldoc/odoc.ml
-+++ b/ocamldoc/odoc.ml
-@@ -25,17 +25,18 @@ let print_DEBUG s = print_string s ; print_newline ()
-
- (* we check if we must load a module given on the command line *)
- let arg_list = Array.to_list Sys.argv
--let (cmo_or_cma_opt, paths) =
-+let (cm_opt, paths) =
- let rec iter (f_opt, inc) = function
- [] | _ :: [] -> (f_opt, inc)
- | "-g" :: file :: q when
- ((Filename.check_suffix file "cmo") or
-- (Filename.check_suffix file "cma")) &
-+ (Filename.check_suffix file "cma") or
-+ (Filename.check_suffix file "cmxs")) &
- (f_opt = None) ->
-- iter (Some file, inc) q
-- | "-i" :: dir :: q ->
-- iter (f_opt, inc @ [dir]) q
-- | _ :: q ->
-+ iter (Some file, inc) q
-+ | "-i" :: dir :: q ->
-+ iter (f_opt, inc @ [dir]) q
-+ | _ :: q ->
- iter (f_opt, inc) q
- in
- iter (None, []) arg_list
-@@ -63,12 +64,11 @@ let get_real_filename name =
- )
-
- let _ =
-- match cmo_or_cma_opt with
-+ match cm_opt with
- None ->
- ()
- | Some file ->
-- (* initializations for dynamic loading *)
-- Dynlink.init ();
-+ let file = Dynlink.adapt_filename file in
- Dynlink.allow_unsafe_modules true;
- try
- let real_file = get_real_filename file in
-diff --git a/ocamldoc/odoc_args.ml b/ocamldoc/odoc_args.ml
-index f82458a..2b1943d 100644
---- a/ocamldoc/odoc_args.ml
-+++ b/ocamldoc/odoc_args.ml
-@@ -24,8 +24,6 @@ type source_file =
-
- let include_dirs = Clflags.include_dirs
-
--let bytecode_mode = ref true
--
- class type doc_generator =
- object
- method generate : Odoc_module.t_module list -> unit
-@@ -254,10 +252,8 @@ let options = ref [
- "-dot", Arg.Unit (fun () -> set_doc_generator !default_dot_generator), M.generate_dot ;
- "-customdir", Arg.Unit (fun () -> Printf.printf "%s\n" Odoc_config.custom_generators_path; exit 0),
- M.display_custom_generators_dir ;
-- "-i", Arg.String (fun s -> if !bytecode_mode then () else (prerr_endline (M.option_not_in_native_code "-i"); exit 1)),
-- M.add_load_dir ;
-- "-g", Arg.String (fun s -> if !bytecode_mode then () else (prerr_endline (M.option_not_in_native_code "-g"); exit 1)),
-- M.load_file ^
-+ "-i", Arg.String (fun s -> ()), M.add_load_dir ;
-+ "-g", Arg.String (fun s -> ()), M.load_file ^
- "\n\n *** HTML options ***\n";
-
- (* html only options *)
-diff --git a/ocamldoc/odoc_args.mli b/ocamldoc/odoc_args.mli
-index bd34ec5..c646536 100644
---- a/ocamldoc/odoc_args.mli
-+++ b/ocamldoc/odoc_args.mli
-@@ -22,10 +22,6 @@ type source_file =
- (** The include_dirs in the OCaml compiler. *)
- val include_dirs : string list ref
-
--(** Indicate if we are in bytecode mode or not.
-- (For the [ocamldoc] command).*)
--val bytecode_mode : bool ref
--
- (** The class type of documentation generators. *)
- class type doc_generator =
- object method generate : Odoc_module.t_module list -> unit end
-diff --git a/ocamldoc/odoc_messages.ml b/ocamldoc/odoc_messages.ml
-index f288da1..9753adf 100644
---- a/ocamldoc/odoc_messages.ml
-+++ b/ocamldoc/odoc_messages.ml
-@@ -24,7 +24,6 @@ let message_version = software^" "^config_version
- let usage = "Usage : "^(Sys.argv.(0))^" [options] <files>\n"
- let options_are = "Options are :"
- let option_version = "\tPrint version and exit"
--let bytecode_only = "(bytecode version only)"
- let latex_only = "(LaTeX only)"
- let texi_only = "(TeXinfo only)"
- let latex_texi_only = "(LaTeX and TeXinfo only)"
-@@ -41,8 +40,8 @@ let option_intf ="<file>\tConsider <file> as a .mli file"
- let option_text ="<file>\tConsider <file> as a .txt file"
- let display_custom_generators_dir = "\tDisplay custom generators standard directory and exit"
- let add_load_dir = "<dir>\tAdd the given directory to the search path for custom\n"^
-- "\t\tgenerators "^bytecode_only
--let load_file = "<file.cm[o|a]>\n\t\tLoad file defining a new documentation generator\n\t\t"^bytecode_only
-+ "\t\tgenerators"
-+let load_file = "<file.cm[o|a|xs]>\n\t\tLoad file defining a new documentation generator"
- let nolabels = "\tIgnore non-optional labels in types"
- let werr = "\tTreat ocamldoc warnings as errors"
- let hide_warnings = "\n\t\tdo not print ocamldoc warnings"
--
1.6.2.4
diff --git a/debian/patches/0008-Add-missing-dynamic-linking-options-for-dbm.patch b/debian/patches/0008-Add-missing-dynamic-linking-options-for-dbm.patch
deleted file mode 100644
index c10e26d..0000000
--- a/debian/patches/0008-Add-missing-dynamic-linking-options-for-dbm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 19 May 2009 17:29:49 +0200
-Subject: [PATCH] Add missing dynamic linking options for dbm
-
-See OCaml PR#4699.
----
- otherlibs/dbm/Makefile | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/otherlibs/dbm/Makefile b/otherlibs/dbm/Makefile
-index 68fd200..894c822 100644
---- a/otherlibs/dbm/Makefile
-+++ b/otherlibs/dbm/Makefile
-@@ -21,6 +21,7 @@ CAMLOBJS=dbm.cmo
- COBJS=cldbm.o
- EXTRACFLAGS=$(DBM_INCLUDES)
- LINKOPTS=$(DBM_LINK)
-+LDOPTS=-ldopt "$(DBM_LINK)"
-
- include ../Makefile
-
---
-1.6.2.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 86e6937..d206397 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch
0006-Patch-config.sh-for-installation.patch
0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
-0008-Add-missing-dynamic-linking-options-for-dbm.patch
diff --git a/debian/rules b/debian/rules
index 6e2e7ad..cc77534 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/quilt/quilt.make
PACKAGE := ocaml
ALL_PACKAGES := $(shell sed -ne 's/^Package: //p' debian/control)
OCAMLMAJOR := 3.11
-OCAMLMINOR := 0
+OCAMLMINOR := 1+rc0
# Build cache (for Debian debugging)
BUILDCACHE := $(wildcard ../ocaml.cache)
--
OCaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list