From: Mike Furr Date: Thu, 24 Jun 2004 17:20:04 +0000 (+0000) Subject: copied in my changes from before. X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~807 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=924a24534cb4546e3f437465c28366e0c17e2de0;p=ocaml.git copied in my changes from before. --- diff --git a/debian/README.Debian b/debian/README.Debian index ae7d5b1b..4c59d26f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -13,8 +13,11 @@ ocaml for Debian 1) The ocaml package has been split into different binary packages : - o ocaml-base : contains the rutime stuff (ocamlrun + dlls) o ocaml : contains the full ocaml suite + o ocaml-nox : the full suite except for the graphics(Tk) modules + o ocaml-base : contains the rutime stuff (ocamlrun + dlls + Tk) + o ocaml-base-nox : contains the rutime 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) o ocaml-source : contains the full ocaml source for the (few) package which @@ -44,4 +47,4 @@ ocaml for Debian /usr/lib/ocaml//stublibs. The older method of using ocaml-ldconf is obsolet now. - -- Sven Luther , Sat, 14 Dec 2002 22:27:22 +0100 + -- Mike Furr , Fri Jun 11 13:27:12 2004 diff --git a/debian/changelog b/debian/changelog index 9a69bf05..99d433e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +ocaml (3.07.2a-3) unstable; urgency=low + + * Split out the ocaml interpreter and all required files into ocaml-interp + * Split out all of the tk/xlibs stuff from ocaml into ocaml-nox and from + ocaml-base into ocaml-base-nox + * Added a bunch of internal modules from the compiler into a new binary: + compiler-libs + * Changed 'Objectif' to 'Objective' in ocaml-source short description + * Cleaned up debian/rules. It now uses stamp files a little more + intelligently so that it doesn't rebuild the whole thing every time + * Check to see if /usr/include/caml EXISTS and is a symblink thus + eliminating a spurious warning message from ocaml-nox.preinst + * Removed 'num' library from ocaml-sources.files + + -- Mike Furr Thu, 10 Jun 2004 22:44:34 -0400 + ocaml (3.07.2a-2) unstable; urgency=low * Now install the config/Makefile so that nat/bignum can be built as an diff --git a/debian/control b/debian/control index 0c9d8680..94d18bff 100644 --- a/debian/control +++ b/debian/control @@ -5,14 +5,14 @@ Maintainer: Sven Luther Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2 Standards-Version: 3.6.0 -Package: ocaml +Package: ocaml-nox Architecture: any -Depends: ${shlibs:Depends}, libncurses5-dev, ocaml-base (= ${Source-Version}), ocaml-base-3.07 -Suggests: xlibs-dev, tcl8.4-dev, tk8.4-dev, ocaml-doc, libgdbm-dev, emacsen +Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.07, ocaml-interp-3.07 +Suggests: ocaml-doc, libgdbm-dev, emacsen Recommends: ledit, file -Provides: ocaml-3.07 ${F:BestProvides} +Provides: ocaml-nox-3.07 ${F:BestProvides} Replaces: camlp4 -Conflicts: camlp4, camlidl (<< 1.04) +Conflicts: camlp4, camlidl (<< 1.04), ocaml (<< 3.07-3) Description: ML language implementation with a class-based object system Objective Caml is an implementation of the ML language, based on the Caml Light dialect extended with a complete class-based object system @@ -32,11 +32,54 @@ Description: ML language implementation with a class-based object system the generated programs deliver excellent performance, while retaining the moderate memory requirements of the bytecode compiler. It is not available on all arches though. + . + This package contains everything needed to develop ocaml applications + that do not require the graphics library. -Package: ocaml-base +Package: ocaml Architecture: any +Depends: ocaml-base (= ${Source-Version}), ocaml-base-3.07, ocaml-nox-3.07 +Suggests: xlibs-dev, tcl8.4-dev, tk8.4-dev, +Provides: ocaml-3.07 +Description: ML language implementation with a class-based object system + Objective Caml is an implementation of the ML language, based on + the Caml Light dialect extended with a complete class-based object system + and a powerful module system in the style of Standard ML. + . + Objective Caml comprises two compilers. One generates bytecode + which is then interpreted by a C program. This compiler runs quickly, + generates compact code with moderate memory requirements, and is + portable to essentially any 32 or 64 bit Unix platform. Performance of + generated programs is quite good for a bytecoded implementation: + almost twice as fast as Caml Light 0.7. This compiler can be used + either as a standalone, batch-oriented compiler that produces + standalone programs, or as an interactive, toplevel-based system. + . + The other compiler generates high-performance native code for a number + of processors. Compilation takes longer and generates bigger code, but + the generated programs deliver excellent performance, while retaining + the moderate memory requirements of the bytecode compiler. It is not + available on all arches though. + . + This package includes the standard ocaml graphics library. + +Package: ocaml-base-nox +Architecture: any +Provides: ocaml-base-nox-3.07 Depends: ${shlibs:Depends} -Conflicts: ocaml (<< 3.04-2) +Conflicts: ocaml (<< 3.04-2), ocaml-base (<< 3.07-3) +Description: Runtime system for ocaml bytecode executables + Objective Caml is an implementation of the ML language, based on + 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 only the runtime system needed to run bytecode + executables that do not use the graphics library. The `ocaml' package + contains the full development suite of Objective Caml. + +Package: ocaml-base +Architecture: any +Depends: ${shlibs:Depends}, ocaml-base-nox-3.07 Provides: ocaml-base-3.07 Description: Runtime system for ocaml bytecode executables Objective Caml is an implementation of the ML language, based on @@ -45,11 +88,12 @@ Description: Runtime system for ocaml bytecode executables . This package contains only the runtime system needed to run bytecode executables. The `ocaml' package contains the full development suite of - Objective Caml. + Objective Caml. You may wish to install the 'ocaml-base-nox' package if + you do not require any graphical capilities for your runtime. Package: ocaml-native-compilers Architecture: arm alpha i386 ia64 powerpc sparc -Depends: ocaml (= ${Source-Version}), ocaml-3.07, ${shlibs:Depends} +Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-3.07, ${shlibs:Depends} Provides: ocaml-best-compilers Description: Native code compilers of the ocaml suite (the .opt ones) Objective Caml is an implementation of the ML language, based on @@ -65,7 +109,7 @@ Description: Native code compilers of the ocaml suite (the .opt ones) Package: ocaml-source Architecture: all Provides: ocaml-source-3.07 -Description: Sources for Objectif Caml +Description: Sources for Objective Caml Objective Caml is an implementation of the ML language, based on the Caml Light dialect extended with a complete class-based object system and a powerful module system in the style of Standard ML. @@ -73,3 +117,29 @@ Description: Sources for Objectif Caml This package contains the sources needed to build some packages which build depend on the ocaml source. Notice that if you want to rebuild ocaml, these will not work, consider using the source package instead. + +Package: ocaml-interp +Architecture: any +Provides: ocaml-interp-3.07 +Depends: ocaml-base-nox-3.07 +Conflicts: ocaml-base (<< 3.07-3) +Description: Ocaml interpreter and standard libraries + Objective Caml is an implementation of the ML language, based on + 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 files required to run an ocaml shell from the + command line. + +Package: ocaml-compiler-libs +Architecture: any +Provides: ocaml-compiler-libs-3.07 +Depends: ocaml-nox-3.07 +Description: Ocaml interpreter and standard libraries + Objective Caml is an implementation of the ML language, based on + 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 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 applications. \ No newline at end of file diff --git a/debian/ocaml-base-nox.copyright b/debian/ocaml-base-nox.copyright new file mode 100644 index 00000000..4175e772 --- /dev/null +++ b/debian/ocaml-base-nox.copyright @@ -0,0 +1,31 @@ +This package was debianized by Sven Luther on +Fri, 14 Dec 2001 12:44:03 +0100. + +It was downloaded from ftp.inria.fr:/lang/caml-light/ + +Upstream Authors: Xavier Leroy, Jerome Vouillon and Damien Doligez + +Copyright: + +In the following, "the Library" refers to all files marked "Copyright +INRIA" in the following directories and their sub-directories: + + asmrun, byterun, config, maccaml, otherlibs, stdlib, win32caml + +The Library is distributed under the terms of the GNU Library General +Public License version 2 (found in /usr/share/common-licenses/LGPL-2 +on debian systems). + +As a special exception to the GNU Library General Public License, you +may link, statically or dynamically, a "work that uses the Library" +with a publicly distributed version of the Library to produce an +executable file containing portions of the Library, and distribute +that executable file under terms of your choice, without any of the +additional requirements listed in clause 6 of the GNU Library General +Public License. By "a publicly distributed version of the Library", +we mean either the unmodified Library as distributed by INRIA, or a +modified version of the Library that is distributed under the +conditions defined in clause 3 of the GNU Library General Public +License. This exception does not however invalidate any other reasons +why the executable file might be covered by the GNU Library General +Public License. diff --git a/debian/ocaml-base-nox.dirs b/debian/ocaml-base-nox.dirs new file mode 100644 index 00000000..745d8eaf --- /dev/null +++ b/debian/ocaml-base-nox.dirs @@ -0,0 +1,5 @@ +usr/bin +usr/share/man/man1 +usr/lib/ocaml/3.07 +usr/lib/ocaml/3.07/stublibs +usr/share/lintian/overrides diff --git a/debian/ocaml-base-nox.docs b/debian/ocaml-base-nox.docs new file mode 100644 index 00000000..2f5ae5ec --- /dev/null +++ b/debian/ocaml-base-nox.docs @@ -0,0 +1,3 @@ +Changes +README +debian/ocaml_packaging_policy diff --git a/debian/ocaml-base-nox.files b/debian/ocaml-base-nox.files new file mode 100644 index 00000000..671f66b4 --- /dev/null +++ b/debian/ocaml-base-nox.files @@ -0,0 +1,9 @@ +usr/bin/ocamlrun +usr/share/man/man1/ocamlrun.1 +usr/lib/ocaml/3.07/stublibs/dllunix.so +usr/lib/ocaml/3.07/stublibs/dllstr.so +usr/lib/ocaml/3.07/stublibs/dllbigarray.so +usr/lib/ocaml/3.07/stublibs/dllthreads.so +usr/lib/ocaml/3.07/stublibs/dllvmthreads.so +usr/lib/ocaml/3.07/stublibs/dllmldbm.so +usr/lib/ocaml/3.07/ld.conf diff --git a/debian/ocaml-base-nox.postinst b/debian/ocaml-base-nox.postinst new file mode 100644 index 00000000..1c4bce5f --- /dev/null +++ b/debian/ocaml-base-nox.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +mkdir -p /usr/local/lib/ocaml/3.07/stublibs || true + +for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml; do \ + if [ -e $i/ld.conf ]; then \ + echo "Removing leftover $i.ld.conf"; \ + rm -f $i/ld.conf; \ + rmdir --ignore-fail-on-non-empty $i; \ + fi; \ +done + +#DEBHELPER# diff --git a/debian/ocaml-base.dirs b/debian/ocaml-base.dirs index 745d8eaf..863cea33 100644 --- a/debian/ocaml-base.dirs +++ b/debian/ocaml-base.dirs @@ -1,5 +1,2 @@ -usr/bin -usr/share/man/man1 -usr/lib/ocaml/3.07 usr/lib/ocaml/3.07/stublibs -usr/share/lintian/overrides + diff --git a/debian/ocaml-base.docs b/debian/ocaml-base.docs deleted file mode 100644 index e05b83d0..00000000 --- a/debian/ocaml-base.docs +++ /dev/null @@ -1,2 +0,0 @@ -README -debian/ocaml_packaging_policy diff --git a/debian/ocaml-base.files b/debian/ocaml-base.files index 5124625b..7e82533d 100644 --- a/debian/ocaml-base.files +++ b/debian/ocaml-base.files @@ -1,4 +1,3 @@ -usr/bin/ocamlrun -usr/share/man/man1/ocamlrun.1 -usr/lib/ocaml/3.07/stublibs -usr/lib/ocaml/3.07/ld.conf +usr/lib/ocaml/3.07/stublibs/dllgraphics.so +usr/lib/ocaml/3.07/stublibs/dlllabltk.so +usr/lib/ocaml/3.07/stublibs/dlltkanim.so diff --git a/debian/ocaml-base.postinst b/debian/ocaml-base.postinst index 1c4bce5f..a24f94fb 100644 --- a/debian/ocaml-base.postinst +++ b/debian/ocaml-base.postinst @@ -1,12 +1,5 @@ -#!/bin/sh -mkdir -p /usr/local/lib/ocaml/3.07/stublibs || true +#!/bin/sh -e -for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml; do \ - if [ -e $i/ld.conf ]; then \ - echo "Removing leftover $i.ld.conf"; \ - rm -f $i/ld.conf; \ - rmdir --ignore-fail-on-non-empty $i; \ - fi; \ -done - -#DEBHELPER# +ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base +ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base +ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base diff --git a/debian/ocaml-base.prerm b/debian/ocaml-base.prerm new file mode 100644 index 00000000..1c54991d --- /dev/null +++ b/debian/ocaml-base.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +rm -f /usr/share/doc/ocaml-base/Changes.gz +rm -f /usr/share/doc/ocaml-base/README.gz +rm -f /usr/share/doc/ocaml-base/ocaml_packaging_policy.gz + + diff --git a/debian/ocaml-compiler-libs.dirs b/debian/ocaml-compiler-libs.dirs new file mode 100644 index 00000000..f88b8ad3 --- /dev/null +++ b/debian/ocaml-compiler-libs.dirs @@ -0,0 +1 @@ +usr/lib/ocaml/3.07/compiler-libs \ No newline at end of file diff --git a/debian/ocaml-interp.dirs b/debian/ocaml-interp.dirs new file mode 100644 index 00000000..f7cd5e48 --- /dev/null +++ b/debian/ocaml-interp.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/man/man1 +usr/lib/ocaml/3.07 diff --git a/debian/ocaml-interp.files b/debian/ocaml-interp.files new file mode 100644 index 00000000..daf9dd0a --- /dev/null +++ b/debian/ocaml-interp.files @@ -0,0 +1,59 @@ +usr/share/man/man1/ocaml.1 +usr/bin/ocaml +usr/lib/ocaml/3.07/stdlib.cma +usr/lib/ocaml/3.07/arg.cmi +usr/lib/ocaml/3.07/array.cmi +usr/lib/ocaml/3.07/arrayLabels.cmi +usr/lib/ocaml/3.07/buffer.cmi +usr/lib/ocaml/3.07/callback.cmi +usr/lib/ocaml/3.07/camlinternalOO.cmi +usr/lib/ocaml/3.07/char.cmi +usr/lib/ocaml/3.07/complex.cmi +usr/lib/ocaml/3.07/digest.cmi +usr/lib/ocaml/3.07/filename.cmi +usr/lib/ocaml/3.07/format.cmi +usr/lib/ocaml/3.07/gc.cmi +usr/lib/ocaml/3.07/genlex.cmi +usr/lib/ocaml/3.07/hashtbl.cmi +usr/lib/ocaml/3.07/int32.cmi +usr/lib/ocaml/3.07/int64.cmi +usr/lib/ocaml/3.07/lazy.cmi +usr/lib/ocaml/3.07/lexing.cmi +usr/lib/ocaml/3.07/list.cmi +usr/lib/ocaml/3.07/listLabels.cmi +usr/lib/ocaml/3.07/map.cmi +usr/lib/ocaml/3.07/marshal.cmi +usr/lib/ocaml/3.07/moreLabels.cmi +usr/lib/ocaml/3.07/nativeint.cmi +usr/lib/ocaml/3.07/obj.cmi +usr/lib/ocaml/3.07/oo.cmi +usr/lib/ocaml/3.07/parsing.cmi +usr/lib/ocaml/3.07/pervasives.cmi +usr/lib/ocaml/3.07/printexc.cmi +usr/lib/ocaml/3.07/printf.cmi +usr/lib/ocaml/3.07/queue.cmi +usr/lib/ocaml/3.07/random.cmi +usr/lib/ocaml/3.07/scanf.cmi +usr/lib/ocaml/3.07/set.cmi +usr/lib/ocaml/3.07/sort.cmi +usr/lib/ocaml/3.07/stack.cmi +usr/lib/ocaml/3.07/stdLabels.cmi +usr/lib/ocaml/3.07/std_exit.cmi +usr/lib/ocaml/3.07/stream.cmi +usr/lib/ocaml/3.07/string.cmi +usr/lib/ocaml/3.07/stringLabels.cmi +usr/lib/ocaml/3.07/sys.cmi +usr/lib/ocaml/3.07/weak.cmi +usr/lib/ocaml/3.07/toplevellib.cma +usr/lib/ocaml/3.07/toploop.cmi +usr/lib/ocaml/3.07/topdirs.cmi +usr/lib/ocaml/3.07/topmain.cmi +usr/lib/ocaml/3.07/unix.cma +usr/lib/ocaml/3.07/unix.cmi +usr/lib/ocaml/3.07/unixLabels.cmi +usr/lib/ocaml/3.07/str.cma +usr/lib/ocaml/3.07/str.cmi +usr/lib/ocaml/3.07/dynlink.cmi +usr/lib/ocaml/3.07/dynlink.cma +usr/lib/ocaml/3.07/bigarray.cmi +usr/lib/ocaml/3.07/bigarray.cma diff --git a/debian/ocaml-nox.dirs b/debian/ocaml-nox.dirs new file mode 100644 index 00000000..ba859252 --- /dev/null +++ b/debian/ocaml-nox.dirs @@ -0,0 +1,10 @@ +usr/bin +usr/lib/ocaml/3.07 +usr/lib/ocaml/3.07/config +usr/include/ocaml/3.07 +usr/share/man/man1 +usr/share/man/man3 +usr/share/emacs/site-lisp/ocaml +usr/share/texmf/tex/latex/misc +usr/X11R6/include/X11/pixmaps +usr/share/lintian/overrides diff --git a/debian/ocaml-nox.menu b/debian/ocaml-nox.menu new file mode 100644 index 00000000..c0ced931 --- /dev/null +++ b/debian/ocaml-nox.menu @@ -0,0 +1,5 @@ +?package(ocaml):needs="text" section="Apps/Programming" \ + title="Ocaml" longtitle="Ocaml Toplevel" \ + hints="ocaml" \ + command="/usr/bin/ocaml" \ + icon="/usr/X11R6/include/X11/pixmaps/JoeCaml.xpm" diff --git a/debian/ocaml-nox.override b/debian/ocaml-nox.override new file mode 100644 index 00000000..41860e6a --- /dev/null +++ b/debian/ocaml-nox.override @@ -0,0 +1,11 @@ +ocaml-nox: binary-without-manpage ocaml-noxbrowser +ocaml-nox: binary-without-manpage ocaml-noxdoc +ocaml-nox: binary-without-manpage ocaml-noxdoc.opt +ocaml-nox: binary-without-manpage ocaml-noxmklib +ocaml-nox: binary-without-manpage ocaml-noxtags +ocaml-nox: binary-without-manpage camlp4sch +ocaml-nox: binary-without-manpage ocaml-noxdep.opt +ocaml-nox: executable-not-elf-or-script ./usr/bin/ocaml-noxtags +ocaml-nox: menu-icon-has-bad-colors /usr/X11R6/include/X11/pixmaps/JoeCaml.xpm: lime +ocaml-nox: postinst-does-not-load-confmodule +ocaml-nox: script-not-executable ./usr/lib/ocaml-nox/3.07/camlheader diff --git a/debian/ocaml-nox.postinst b/debian/ocaml-nox.postinst new file mode 100644 index 00000000..ae7b722e --- /dev/null +++ b/debian/ocaml-nox.postinst @@ -0,0 +1,9 @@ +#!/bin/sh -e + +ln -sf /usr/lib/ocaml/3.07/caml /usr/include/caml + +ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-nox +ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-nox +ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-nox + +#DEBHELPER# diff --git a/debian/ocaml-nox.postrm b/debian/ocaml-nox.postrm new file mode 100644 index 00000000..68856b1d --- /dev/null +++ b/debian/ocaml-nox.postrm @@ -0,0 +1,5 @@ +#!/bin/sh -e + +rm -f /usr/include/caml + +#DEBHELPER# diff --git a/debian/ocaml-nox.preinst b/debian/ocaml-nox.preinst new file mode 100644 index 00000000..b6c08688 --- /dev/null +++ b/debian/ocaml-nox.preinst @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ ! -h /usr/include/caml -a -e /usr/include/caml ]; then + echo "WARNING, /usr/include/caml is not a symlink !!!!" +fi + +#DEBHELPER# diff --git a/debian/ocaml-nox.prerm b/debian/ocaml-nox.prerm new file mode 100644 index 00000000..0fa967a2 --- /dev/null +++ b/debian/ocaml-nox.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +rm -f /usr/share/doc/ocaml-nox/Changes.gz +rm -f /usr/share/doc/ocaml-nox/README.gz +rm -f /usr/share/doc/ocaml-nox/ocaml_packaging_policy.gz + + diff --git a/debian/ocaml-source.files b/debian/ocaml-source.files index 8a40978c..42023a3f 100644 --- a/debian/ocaml-source.files +++ b/debian/ocaml-source.files @@ -956,66 +956,6 @@ otherlibs/labltk/tkanim/tkAnimGIF.c otherlibs/labltk/tkanim/tkAppInit.c otherlibs/labltk/tkanim/tkanim.ml otherlibs/labltk/tkanim/tkanim.mli -otherlibs/num/bignum/c/bztest.c -otherlibs/num/bignum/c/KerN.c -otherlibs/num/bignum/c/bz.c -otherlibs/num/bignum/c/bzf.c -otherlibs/num/bignum/c/bn/bnDivide.c -otherlibs/num/bignum/c/bn/bnCmp.c -otherlibs/num/bignum/c/bn/bnInit.c -otherlibs/num/bignum/c/bn/bnMult.c -otherlibs/num/bignum/c/testKerN.c -otherlibs/num/bignum/h/BigNum.h -otherlibs/num/bignum/h/BigZ.h -otherlibs/num/bignum/h/BntoBnn.h -otherlibs/num/bignum/Makefile -otherlibs/num/bignum/README -otherlibs/num/bignum/o/EMPTY -otherlibs/num/bignum/s/68KerN.s -otherlibs/num/bignum/s/68KerN_mot.s -otherlibs/num/bignum/s/68KerN_sony.s -otherlibs/num/bignum/s/RS6000KerN.s -otherlibs/num/bignum/s/alphaKerN.s -otherlibs/num/bignum/s/hpKerN.s -otherlibs/num/bignum/s/i960KerN.s -otherlibs/num/bignum/s/mipsKerN.s -otherlibs/num/bignum/s/nsKerN.s -otherlibs/num/bignum/s/pyramidKerN.s -otherlibs/num/bignum/s/sparcKerN.s -otherlibs/num/bignum/s/sparcfpuKerN.s -otherlibs/num/bignum/s/supersparcKerN.s -otherlibs/num/bignum/s/unix2vms.sed -otherlibs/num/bignum/s/vaxKerN.mar -otherlibs/num/bignum/s/vaxKerN.s -otherlibs/num/bignum/s/x86KerN.s -otherlibs/num/Makefile -otherlibs/num/README -otherlibs/num/arith_flags.ml -otherlibs/num/arith_flags.mli -otherlibs/num/arith_status.ml -otherlibs/num/arith_status.mli -otherlibs/num/big_int.ml -otherlibs/num/big_int.mli -otherlibs/num/int_misc.ml -otherlibs/num/int_misc.mli -otherlibs/num/nat.h -otherlibs/num/nat.ml -otherlibs/num/nat.mli -otherlibs/num/nat_stubs.c -otherlibs/num/num.ml -otherlibs/num/num.mli -otherlibs/num/ratio.ml -otherlibs/num/ratio.mli -otherlibs/num/string_misc.ml -otherlibs/num/string_misc.mli -otherlibs/num/test/Makefile -otherlibs/num/test/end_test.ml -otherlibs/num/test/test.ml -otherlibs/num/test/test_big_ints.ml -otherlibs/num/test/test_io.ml -otherlibs/num/test/test_nats.ml -otherlibs/num/test/test_nums.ml -otherlibs/num/test/test_ratios.ml otherlibs/str/Makefile otherlibs/str/str.ml otherlibs/str/str.mli diff --git a/debian/ocaml.dirs b/debian/ocaml.dirs index ba859252..be5e41be 100644 --- a/debian/ocaml.dirs +++ b/debian/ocaml.dirs @@ -1,10 +1,2 @@ usr/bin usr/lib/ocaml/3.07 -usr/lib/ocaml/3.07/config -usr/include/ocaml/3.07 -usr/share/man/man1 -usr/share/man/man3 -usr/share/emacs/site-lisp/ocaml -usr/share/texmf/tex/latex/misc -usr/X11R6/include/X11/pixmaps -usr/share/lintian/overrides diff --git a/debian/ocaml.docs b/debian/ocaml.docs index c0a384b0..06c36a06 100644 --- a/debian/ocaml.docs +++ b/debian/ocaml.docs @@ -1,5 +1,2 @@ -README -Changes -debian/ocaml_packaging_policy debian/README.labltk otherlibs/labltk/examples_labltk diff --git a/debian/ocaml.files b/debian/ocaml.files new file mode 100644 index 00000000..bb20f0da --- /dev/null +++ b/debian/ocaml.files @@ -0,0 +1,11 @@ +usr/bin/labltk +usr/lib/ocaml/3.07/libgraphics.a +usr/lib/ocaml/3.07/graphics.cma +usr/lib/ocaml/3.07/graphics.cmi +usr/lib/ocaml/3.07/graphicsX11.cmi +usr/lib/ocaml/3.07/graphics.mli +usr/lib/ocaml/3.07/graphicsX11.mli +usr/lib/ocaml/3.07/labltk +usr/lib/ocaml/3.07/graphics.cmx +usr/lib/ocaml/3.07/graphics.cmxa +usr/lib/ocaml/3.07/graphics.a \ No newline at end of file diff --git a/debian/ocaml.menu b/debian/ocaml.menu deleted file mode 100644 index c0ced931..00000000 --- a/debian/ocaml.menu +++ /dev/null @@ -1,5 +0,0 @@ -?package(ocaml):needs="text" section="Apps/Programming" \ - title="Ocaml" longtitle="Ocaml Toplevel" \ - hints="ocaml" \ - command="/usr/bin/ocaml" \ - icon="/usr/X11R6/include/X11/pixmaps/JoeCaml.xpm" diff --git a/debian/ocaml.override b/debian/ocaml.override index 346481db..49ae98ff 100644 --- a/debian/ocaml.override +++ b/debian/ocaml.override @@ -1,16 +1,7 @@ ocaml: binary-without-manpage labltk -ocaml: binary-without-manpage ocamlbrowser -ocaml: binary-without-manpage ocamldoc -ocaml: binary-without-manpage ocamldoc.opt -ocaml: binary-without-manpage ocamlmklib -ocaml: binary-without-manpage ocamltags -ocaml: binary-without-manpage camlp4sch -ocaml: binary-without-manpage ocamldep.opt ocaml: cvsignore-file-in-package usr/share/doc/ocaml/examples_labltk/.cvsignore -ocaml: executable-not-elf-or-script ./usr/bin/ocamltags ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.06/stublibs/dllgraphics.so /usr/X11R6/lib ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.06/stublibs/dlllabltk.so /usr/lib:/usr/X11R6/lib ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.06/stublibs/dlltkanim.so /usr/lib:/usr/X11R6/lib -ocaml: menu-icon-has-bad-colors /usr/X11R6/include/X11/pixmaps/JoeCaml.xpm: lime ocaml: postinst-does-not-load-confmodule -ocaml: script-not-executable ./usr/lib/ocaml/3.07/camlheader + diff --git a/debian/ocaml.postinst b/debian/ocaml.postinst index 14a8a7f7..a24f94fb 100644 --- a/debian/ocaml.postinst +++ b/debian/ocaml.postinst @@ -1,5 +1,5 @@ #!/bin/sh -e -ln -sf /usr/lib/ocaml/3.07/caml /usr/include/caml - -#DEBHELPER# +ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base +ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base +ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base diff --git a/debian/ocaml.postrm b/debian/ocaml.postrm deleted file mode 100644 index 68856b1d..00000000 --- a/debian/ocaml.postrm +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -e - -rm -f /usr/include/caml - -#DEBHELPER# diff --git a/debian/ocaml.preinst b/debian/ocaml.preinst deleted file mode 100644 index 33b04567..00000000 --- a/debian/ocaml.preinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ ! -h /usr/include/caml ]; then - echo "WARNING, /usr/include/caml is not a symlink !!!!" -fi - -#DEBHELPER# diff --git a/debian/ocaml.prerm b/debian/ocaml.prerm new file mode 100644 index 00000000..ed58b545 --- /dev/null +++ b/debian/ocaml.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +rm -f /usr/share/doc/ocaml/Changes.gz +rm -f /usr/share/doc/ocaml/README.gz +rm -f /usr/share/doc/ocaml/ocaml_packaging_policy.gz + + diff --git a/debian/rules b/debian/rules index 69f809d5..07474f91 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -config.status: configure +config-stamp: configure dh_testdir # Add here commands to configure the package. ./configure --with-pthread -prefix /usr \ @@ -49,13 +49,14 @@ config.status: configure echo "Aborting."; \ exit 1; \ fi + touch config-stamp #Architecture build: build-arch build-indep build-arch: build-arch-stamp -build-arch-stamp: patch-stamp config.status +build-arch-stamp: patch-stamp config-stamp # Add here commands to compile the arch part of the package. if test ! -d boot.debian; then \ @@ -67,9 +68,10 @@ build-arch-stamp: patch-stamp config.status $(MAKE) opt opt.opt; \ touch opt-built-stamp; \ fi + touch build-arch-stamp build-indep: build-indep-stamp -build-indep-stamp: patch-stamp config.status +build-indep-stamp: patch-stamp config-stamp # Add here commands to compile the indep part of the package. #$(MAKE) doc @@ -125,34 +127,59 @@ install-arch: #$(MAKE) install prefix=$(CURDIR)/debian/ocaml/usr # Let's install ocaml first. - $(MAKE) install PREFIX=$(CURDIR)/debian/ocaml/usr - $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml/usr/share/emacs/site-lisp/ocaml \ + $(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr + $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-nox/usr/share/emacs/site-lisp/ocaml \ NOCOMPILE=true simple-install - $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml/usr/bin install-ocamltags + $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-nox/usr/bin install-ocamltags install -m 644 debian/JoeCaml.xpm \ - $(CURDIR)/debian/ocaml/usr/X11R6/include/X11/pixmaps + $(CURDIR)/debian/ocaml-nox/usr/X11R6/include/X11/pixmaps + install -m 644 debian/ocaml-nox.override \ + $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox install -m 644 debian/ocaml.override \ - $(CURDIR)/debian/ocaml/usr/share/lintian/overrides/ocaml + $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml install -m 644 otherlibs/labltk/README \ $(CURDIR)/debian/README.labltk install -m 644 config/Makefile \ - $(CURDIR)/debian/ocaml/usr/lib/ocaml/$(VERSION)/config/Makefile + $(CURDIR)/debian/ocaml-nox/usr/lib/ocaml/$(VERSION)/config/Makefile - # Then move the ocaml-base package. - dh_movefiles -pocaml-base --sourcedir=debian/ocaml + # now move the graphics files over + if [ -e opt-built-stamp ]; then \ + dh_movefiles -pocaml \ + --sourcedir=debian/ocaml-nox; \ + else \ + dh_movefiles -pocaml \ + --sourcedir=debian/ocaml-nox \ + --exclude=*.cmx --exclude=*.cmxa; \ + fi + + + # Then move the ocaml-base-nox package. + dh_movefiles -pocaml-base-nox --sourcedir=debian/ocaml-nox install -m 644 debian/ld.conf \ - $(CURDIR)/debian/ocaml-base/usr/lib/ocaml/$(VERSION) - #install -m 644 debian/ocaml-base.override \ - $(CURDIR)/debian/ocaml-base/usr/share/lintian/overrides/ocaml-base + $(CURDIR)/debian/ocaml-base-nox/usr/lib/ocaml/$(VERSION) + + # and base's corresponding graphics stuff. + dh_movefiles -pocaml-base --sourcedir=debian/ocaml-nox # The ocaml-native-compilers, if available. if [ -e opt-built-stamp ]; then \ dh_movefiles -pocaml-native-compilers \ - --sourcedir=debian/ocaml; \ + --sourcedir=debian/ocaml-nox; \ install -m 644 debian/ocaml-native-compilers.override \ $(CURDIR)/debian/ocaml-native-compilers/usr/share/lintian/overrides/ocaml-native-compilers; \ fi + # The interpreter files + dh_movefiles -pocaml-interp \ + --sourcedir=debian/ocaml-nox; \ + + # Some extra stuff + install -m 644 utils/*.mli utils/*.cmi utils/*.cmo utils/*.cmx utils/*.o \ + typing/*.mli typing/*.cmi typing/*.cmo typing/*.cmx typing/*.o \ + parsing/*.mli parsing/*.cmi parsing/*.cmo parsing/*.cmx parsing/*.o \ + $(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/3.07/compiler-libs + + dh_install -a # Must not depend on anything. This is to be called by @@ -195,15 +222,19 @@ binary-arch: build-arch install-arch $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common dh_shlibdeps -s if [ ! -e opt-built-stamp ]; then \ - dh_gencontrol -pocaml \ + dh_gencontrol -pocaml-nox \ -u-VF:BestProvides=",ocaml-best-compilers"; \ else \ - dh_gencontrol -pocaml \ + dh_gencontrol -pocaml-nox \ -u-VF:BestProvides=""; \ dh_gencontrol -pocaml-native-compilers; \ fi + dh_gencontrol -pocaml + dh_gencontrol -pocaml-base-nox dh_gencontrol -pocaml-base dh_gencontrol -pocaml-source + dh_gencontrol -pocaml-interp + dh_gencontrol -pocaml-compiler-libs dh_md5sums -s dh_builddeb -s