[Pkg-xen-devel] [PATCH 0/9] Package the ocaml libraries

[Jon Ludlam]

The following set of patches package up the ocaml libraries that are
part of the standard xen build. The patches are also currently available
at: https://github.com/jonludlam/pkg-xen/commits/for-debian 

There are some things to note:

1. The 5 patches imported from xen-unstable are not, and will not go 
   into the xen-4.1-stable series. However, the patches were created
   at the request of the Debian Ocaml Task Force as the ocaml libraries
   were polluting the global namespace of packages with their too-short
   names.

2. The libraries have been installed under /usr/lib/xen-4.1/lib/ocaml,
   which is not the standard place to install ocaml findlib packages.
   It is in keeping with the current packaging of xen in debian though.
   To use the libraries, set an environment variable:

      OCAMLPATH=/usr/lib/xen-4.1/lib/ocaml

   and then findlib should locate the packages.

3. Compilation and running of non-custom bytecode executables requires
   the setting of an additional environment variable:

      CAML_LD_LIBRARY_PATH=/usr/lib/xen-4.1/lib/ocaml/stublibs:/usr/lib/\
	xen-4.1/lib

   Bytecode executables compiled with the -custom flag work without this
   setting.

4. Only the last 2 patches actually change the packaging at all. The first
   of these two simply bumps the XS-Python-Version to 2.7.  It's the last
   patch that needs the most eyes on it to check for bugs.

These patches were created with the help and assistance of Ian Campbell,
Thomas Goirand, and the Ocaml Debian Task Force.

Jon Ludlam (9):
  Import patch 23936:cdb34816a40a from xen-unstable.hg - renaming the
    ocamlfind packages
  Import patch 23937:5173834e8476 from xen-unstable.hg
  Import patch 23938:fa04fbd56521 from xen-unstable.hg
  Import patch 23939:51288f69523f from xen-unstable.hg
  Import patch 23940:187d59e32a58 from xen-unstable.hg
  Fix the ocaml libraries to install correctly under
    /usr/lib/xen-4.1/lib/ocaml
  Put an annotation at the top of the tools-ocaml-fix-rpath patch
  Bump XS-Python-Version to 2.7
  Create 2 ocaml packages, libxen-ocaml-4.1 and libxen-ocaml-dev.

 xen/debian/libxen-dev.install                      |    2 +
 xen/debian/libxen-ocaml-dev.install                |    2 +
 xen/debian/libxen-ocaml.install                    |    3 +
 xen/debian/patches/series                          |    6 +
 xen/debian/patches/tools-ocaml-fix-rpath.diff      |   24 +
 .../patches/tools-ocaml-fix-xc-dependencies.diff   |   21 +
 xen/debian/patches/tools-ocaml-fix-xc.diff         |   45 +
 xen/debian/patches/tools-ocaml-remove-log.diff     | 1509 ++++
 xen/debian/patches/tools-ocaml-remove-uuid.diff    |  321 +
 .../tools-ocaml-rename-ocamlfind-packages.diff     | 7924 ++++++++++++++++++++
 xen/debian/rules                                   |    2 +-
 xen/debian/rules.real                              |   36 +
 xen/debian/templates/control.main.in               |   18 +
 xen/debian/templates/control.source.in             |    7 +-
 14 files changed, 9917 insertions(+), 3 deletions(-)
 create mode 100644 xen/debian/libxen-ocaml-dev.install
 create mode 100644 xen/debian/libxen-ocaml.install
 create mode 100644 xen/debian/patches/tools-ocaml-fix-rpath.diff
 create mode 100644 xen/debian/patches/tools-ocaml-fix-xc-dependencies.diff
 create mode 100644 xen/debian/patches/tools-ocaml-fix-xc.diff
 create mode 100644 xen/debian/patches/tools-ocaml-remove-log.diff
 create mode 100644 xen/debian/patches/tools-ocaml-remove-uuid.diff
 create mode 100644 xen/debian/patches/tools-ocaml-rename-ocamlfind-packages.diff

-- 
1.7.7