This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml.
commit 0438e737c755efb1bc18b2d52fbf5307ef99e3db Author: Stephane Glondu <st...@glondu.net> Date: Mon Feb 16 11:36:40 2015 +0100 Remove traces of camlp4 --- debian/MANIFEST | 1 - debian/control | 10 +-- debian/copyright | 2 +- debian/man/camlp4.1 | 137 ------------------------------------ debian/ocaml-base-nox.README.Debian | 4 +- debian/rules | 10 +-- 6 files changed, 11 insertions(+), 153 deletions(-) diff --git a/debian/MANIFEST b/debian/MANIFEST index 0cb84f2..7313b57 100644 --- a/debian/MANIFEST +++ b/debian/MANIFEST @@ -11,7 +11,6 @@ debian/copyright debian/gbp.conf debian/gen_modules.pl debian/ld.conf.in -debian/man/camlp4.1 debian/man/ocamldumpobj.1 debian/man/ocamlmklib.1 debian/man/ocamlobjinfo.1 diff --git a/debian/control b/debian/control index 3bf4d0e..03bbc35 100644 --- a/debian/control +++ b/debian/control @@ -159,11 +159,11 @@ Description: Native code compilers of the OCaml suite (the .opt ones) the Caml Light dialect extended with a complete class-based object system and a powerful module system in the style of Standard ML. . - This package contains the native code version of the compilers and lexer - (ocamlc.opt, ocamllex.opt, ocamlopt.opt, camlp4o.opt and camlp4r.opt). - The normal version of these programs are found in the 'ocaml' package. - For big source codes, these packages can be two to three times faster, but - for most normal sized sources, the difference won't be noticeable. + This package contains the native code version of the compilers + (ocamlc.opt, ocamllex.opt, ocamlopt.opt. The normal version of these + programs are found in the 'ocaml' package. For big source codes, + these packages can be two to three times faster, but for most normal + sized sources, the difference won't be noticeable. Package: ocaml-source Architecture: all diff --git a/debian/copyright b/debian/copyright index 7025c76..aa47911 100644 --- a/debian/copyright +++ b/debian/copyright @@ -31,7 +31,7 @@ License: LGPL-2 In the following, "the Library" refers to all files marked "Copyright INRIA" in the following directories and their sub-directories: - asmrun, byterun, camlp4, config, otherlibs, stdlib, win32caml + asmrun, byterun, config, otherlibs, stdlib, win32caml and "the Compiler" refers to all files marked "Copyright INRIA" in the following directories and their sub-directories: diff --git a/debian/man/camlp4.1 b/debian/man/camlp4.1 deleted file mode 100644 index 780b103..0000000 --- a/debian/man/camlp4.1 +++ /dev/null @@ -1,137 +0,0 @@ -.TH CAMLP4 "1" "June 2007" "CamlP4 3.10.0" "User Commands" -.SH NAME -CamlP4 \- Pre-Processor-Pretty-Printer for Objective Caml -.SH SYNOPSIS -.B camlp4 -[\fIload\-options\fR] [\fI\-\-\fR] [\fIother\-options\fR] -.SH DESCRIPTION -Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml. It offers tools -for syntax (Stream Parsers and Grammars) and the ability to modify the concrete -syntax of the language (Quotations, Syntax Extensions). - -The Objective Caml compiler has a special option "\-pp", allowing to call any -preprocessor. If Camlp4 is used, the parsing is done (only once) by Camlp4, and -the Objective Caml compiler resumes the rest of the compilation (typing, code -generation). - -Camlp4 can parse normal OCaml concrete syntax or any other user-definable -syntax. As an example, an alternative syntax is provided, named Revised, -because it tries to fix some problems of the original syntax. - -Camlp4 can pretty print the normal OCaml concrete syntax or the revised one -(Pretty-Printer). It is therefore always possible to have a version of your -sources compilable by the compiler Objective Caml without preprocessing. - -Camlp4 can also serve as a Program Transformation tool, the user can supply -transformations and apply them easily as a pre-processing task. This is done -with Filters. -.SH OPTIONS -.TP -\fB<file>.ml\fR -Parse this implementation file -.TP -\fB<file>.mli\fR -Parse this interface file -.TP -\fB<file>.(cmo|cma)\fR -Load this module inside the Camlp4 core -.TP -\fB\-I\fR <directory> -Add directory in search patch for object files. -.TP -\fB\-where\fR -Print camlp4 library directory and exit. -.TP -\fB\-nolib\fR -No automatic search for object files in library directory. -.TP -\fB\-intf\fR <file> -Parse <file> as an interface, whatever its extension. -.TP -\fB\-impl\fR <file> -Parse <file> as an implementation, whatever its extension. -.TP -\fB\-str\fR <string> -Parse <string> as an implementation. -.TP -\fB\-unsafe\fR -Generate unsafe accesses to array and strings. -.TP -\fB\-noassert\fR -Obsolete, do not use this option. -.TP -\fB\-verbose\fR -More verbose in parsing errors. -.TP -\fB\-loc\fR <name> -Name of the location variable (default: _loc). -.TP -\fB\-QD\fR <file> -Dump quotation expander result in case of syntax error. -.TP -\fB\-o\fR <file> -Output on <file> instead of standard output. -.TP -\fB\-v\fR -Print Camlp4 version and exit. -.TP -\fB\-version\fR -Print Camlp4 version number and exit. -.TP -\fB\-no_quot\fR -Don't parse quotations, allowing to use, e.g. "<:>" as token. -.TP -\fB\-loaded\-modules\fR -Print the list of loaded modules. -.TP -\fB\-parser\fR <name> -Load the parser Camlp4Parsers/<name>.cmo -.TP -\fB\-printer\fR <name> -Load the printer Camlp4Printers/<name>.cmo -.TP -\fB\-filter\fR <name> -Load the filter Camlp4Filters/<name>.cmo -.TP -\fB\-ignore\fR -ignore the next argument -.TP -\fB\-\-\fR -Deprecated, does nothing -.PP -Options added by loaded object files: -.TP -\fB\-I\fR <string> -Add a directory to INCLUDE search path. -.TP -\fB\-U\fR <string> -Undefine for IFDEF instruction. -.TP -\fB\-D\fR <string> -Define for IFDEF instruction. -.TP -\fB\-meta_action\fR -Undocumented -.TP -\fB\-split_gext\fR -Old name for the option \fB\-split_ext\fR. -.TP -\fB\-split_ext\fR -Split EXTEND by functions to turn around a PowerPC problem. -.TP -\fB\-help_seq\fR -Print explanations about new sequences and exit. -.SH "SEE ALSO" -.BR ocamlc(1), -.BR ocaml(1). -.br -The full documentation for -.B CamlP4 -is being developed on a Wiki available on the web at -.br -.B <http://brion.inria.fr/gallium/index.php/Camlp4>. -.SH AUTHOR -CamlP4 is Copyright INRIA, it was mainly written by Nicolas Pouillard. -.PP -This manual page was written by Stefano Zacchiroli <z...@debian.org>, -for the Debian project (but may be used by others). diff --git a/debian/ocaml-base-nox.README.Debian b/debian/ocaml-base-nox.README.Debian index fc95082..586c27d 100644 --- a/debian/ocaml-base-nox.README.Debian +++ b/debian/ocaml-base-nox.README.Debian @@ -9,7 +9,7 @@ OCaml for Debian o ocaml-base-nox: contains the runtime stuff (ocamlrun + dlls - Tk) o ocaml-native-compilers: contains the native built part of the OCaml suite - (ocamlc.opt, ocamlopt.opt, ocamllex.opt, camlp4o.opt and camlp4r.opt) + (ocamlc.opt, ocamlopt.opt, ocamllex.opt) o ocaml-compiler-libs: contains several modules used internally by the OCaml compilers. They are not needed for normal OCaml development, but may be helpful in the development of certain @@ -40,7 +40,7 @@ OCaml for Debian /usr/local/lib/ocaml/<ocaml_version>/stublibs which is searched before /usr/lib/ocaml/<ocaml_version>/stublibs. - -- Jerome Marant <jer...@debian.org>, Sat Aug 20 11:51:32 2005 + -- Stéphane Glondu <glo...@debian.org>, Mon, 16 Feb 2015 11:33:25 +0100 ocamldoc's LaTeX output ----------------------- diff --git a/debian/rules b/debian/rules index e95a083..beb734a 100755 --- a/debian/rules +++ b/debian/rules @@ -194,8 +194,7 @@ ifeq (,$(DEB_TEST_BUILD_PREFIX)) # Remove uninstalled files rm -f \ $(INSTDIR)/share/man/man1/ocamlopt.opt.1 \ - $(INSTDIR)/share/man/man1/ocamlc.opt.1 \ - $(INSTDIR)/bin/camlp4boot + $(INSTDIR)/share/man/man1/ocamlc.opt.1 ifeq ($(OCAML_HAVE_OCAMLOPT),no) # Remove files that make no sense without ocamlopt rm -f \ @@ -221,9 +220,6 @@ endif cp tools/$$u debian/ocaml-nox/usr/bin/ocaml$$u; \ fi \ done - for mli in `find camlp4 -name '*.mli'` ; do \ - cp --parents $$mli debian/camlp4$(OCAML_STDLIB_DIR); \ - done for pkg in ocaml ocaml-nox ocaml-base; do ( \ cd debian/$$pkg/usr/share/doc/$$pkg && \ ln -sf ../ocaml-base-nox/README.gz . && \ @@ -246,8 +242,8 @@ endif # Create .md5sums files and compute dependencies. Use $(OCAML_ABI) # because we know that OCaml ABI represents best dependencies for # OCaml package. - dh_ocaml -Xcompiler-libs -Xcamlp4-extra \ - --runtime-map ocaml-nox:ocaml-base-nox,ocaml:ocaml-base,camlp4 \ + dh_ocaml -Xcompiler-libs \ + --runtime-map ocaml-nox:ocaml-base-nox,ocaml:ocaml-base \ --checksum $(OCAML_ABI) dh_gencontrol # Check that OCAML_ABI is correct -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.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