[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.4-2-8-gd8b001e

Stephane Glondu steph at glondu.net
Sat Jul 25 12:47:34 UTC 2009 

The following commit has been merged in the master branch:
commit d8b001e05076a310a9b64fb4210f5cb26559b281
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 25 11:22:58 2009 +0200

    Add new binary packages
    
     - ocaml-findlib: executables not depending on X
     - ocaml-findlib-wizard: make_wizard (which depends on X)
     - libfindlib-ocaml{,-dev}: the remaining, dispatched as usual

diff --git a/debian/changelog b/debian/changelog
index 8a3243e..1dd7628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,12 +7,16 @@ findlib (1.2.4-3) UNRELEASED; urgency=low
   * Build-depend on dh-ocaml 0.9
 
   [ Stephane Glondu ]
+  * Add new binary packages:
+    - ocaml-findlib: keep there executables not depending on X
+    - ocaml-findlib-wizard: make_wizard (which depends on X)
+    - libfindlib-ocaml{,-dev}: the remaining files, dispatched as usual
   * debian/control:
     - add DM-Upload-Allowed
     - move to section ocaml
     - update Standards-Version to 3.8.2
 
- -- Stephane Glondu <steph at glondu.net>  Sat, 25 Jul 2009 11:02:42 +0200
+ -- Stephane Glondu <steph at glondu.net>  Sat, 25 Jul 2009 13:46:42 +0200
 
 findlib (1.2.4-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 223f139..317733c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,22 +24,85 @@ Homepage: http://projects.camlcity.org/projects/findlib.html
 Package: ocaml-findlib
 Architecture: any
 Depends:
+ libfindlib-ocaml-dev,
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Provides:
- ${ocaml:Provides}
-Description: Management tool for OCaml programming language libraries
+Suggests:
+ camlp4,
+ ocaml-findlib-wizard
+Provides: ${ocaml:Provides}
+Description: management tool for OCaml libraries
+ The "findlib" OCaml library provides a scheme to manage reusable
+ software components (packages), and includes tools that support this
+ scheme. Packages are collections of OCaml modules for which
+ metainformation can be stored. The packages are kept in the
+ filesystem hierarchy, but with strict directory structure. The
+ library contains functions to look the directory up that stores a
+ package, to query metainformation about a package, and to retrieve
+ dependency information about multiple packages.
+ .
+ This package contains a tool (ocamlfind) that allows the user to
+ enter queries on the command-line. In order to simplify compilation
+ and linkage, there are new frontends, all driven by ocamlfind, for
+ the various OCaml compilers that can directly deal with packages.
+
+Package: libfindlib-ocaml-dev
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: ocaml-findlib
+Provides: ${ocaml:Provides}
+Replaces: ocaml-findlib (<< 1.2.4-3)
+Conflicts: ocaml-findlib (<< 1.2.4-3)
+Description: library for managing OCaml libraries (development files)
  The "findlib" OCaml library provides a scheme to manage reusable
  software components (packages), and includes tools that support this
  scheme. Packages are collections of OCaml modules for which
- metainformation can be stored. The packages are kept in the filesystem
- hierarchy, but with strict directory structure. The library contains
- functions to look the directory up that stores a package, to query
- metainformation about a package, and to retrieve dependency information
- about multiple packages.
+ metainformation can be stored. The packages are kept in the
+ filesystem hierarchy, but with strict directory structure. The
+ library contains functions to look the directory up that stores a
+ package, to query metainformation about a package, and to retrieve
+ dependency information about multiple packages.
  .
- This package contain also a tool (ocamlfind) that allows the user to
- enter queries on the command-line. In order to simplify compilation and
- linkage, there are new frontends, all driven by ocamlfind, for the
- various OCaml compilers that can directly deal with packages.
+ This package contains development files needed to compile programs
+ using findlib.
+
+Package: libfindlib-ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Replaces: ocaml-findlib (<< 1.2.4-3)
+Conflicts: ocaml-findlib (<< 1.2.4-3)
+Description: library for managing OCaml libraries (runtime)
+ The "findlib" OCaml library provides a scheme to manage reusable
+ software components (packages), and includes tools that support this
+ scheme. Packages are collections of OCaml modules for which
+ metainformation can be stored. The packages are kept in the
+ filesystem hierarchy, but with strict directory structure. The
+ library contains functions to look the directory up that stores a
+ package, to query metainformation about a package, and to retrieve
+ dependency information about multiple packages.
+ .
+ This packages contains files that are or may be needed at runtime by
+ programs using findlib (META files and dynamically-loadable files).
+
+Package: ocaml-findlib-wizard
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Replaces: ocaml-findlib (<< 1.2.4-3)
+Conflicts: ocaml-findlib (<< 1.2.4-3)
+Description: Makefile and META wizard for OCaml libraries
+ This wizard helps you creating Makefiles and META files for simple
+ OCaml library projects. It generates a Makefile, and the Makefile
+ produces the META file. This generated build system is a starting
+ point and can be later fine-tuned.
diff --git a/debian/ocaml-findlib.doc-base.guide b/debian/libfindlib-ocaml-dev.doc-base.guide
similarity index 61%
rename from debian/ocaml-findlib.doc-base.guide
rename to debian/libfindlib-ocaml-dev.doc-base.guide
index 5d15ec5..5f7c6a1 100644
--- a/debian/ocaml-findlib.doc-base.guide
+++ b/debian/libfindlib-ocaml-dev.doc-base.guide
@@ -5,5 +5,5 @@ Abstract: User manual for OCaml findlib, a module manager for OCaml
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/ocaml-findlib/guide-html/index.html
-Files: /usr/share/doc/ocaml-findlib/guide-html/*
+Index: /usr/share/doc/libfindlib-ocaml-dev/guide-html/index.html
+Files: /usr/share/doc/libfindlib-ocaml-dev/guide-html/*
diff --git a/debian/ocaml-findlib.doc-base.refman b/debian/libfindlib-ocaml-dev.doc-base.refman
similarity index 64%
rename from debian/ocaml-findlib.doc-base.refman
rename to debian/libfindlib-ocaml-dev.doc-base.refman
index 0e16385..8568790 100644
--- a/debian/ocaml-findlib.doc-base.refman
+++ b/debian/libfindlib-ocaml-dev.doc-base.refman
@@ -5,5 +5,5 @@ Abstract: Reference Manual for OCaml findlib, a module manager for OCaml
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/ocaml-findlib/ref-html/index.html
-Files: /usr/share/doc/ocaml-findlib/ref-html/*
+Index: /usr/share/doc/libfindlib-ocaml-dev/ref-html/index.html
+Files: /usr/share/doc/libfindlib-ocaml-dev/ref-html/*
diff --git a/debian/libfindlib-ocaml-dev.docs b/debian/libfindlib-ocaml-dev.docs
new file mode 100644
index 0000000..c6b2067
--- /dev/null
+++ b/debian/libfindlib-ocaml-dev.docs
@@ -0,0 +1,2 @@
+doc/guide-html
+doc/ref-html
diff --git a/debian/libfindlib-ocaml-dev.install.in b/debian/libfindlib-ocaml-dev.install.in
new file mode 100644
index 0000000..0a65ffb
--- /dev/null
+++ b/debian/libfindlib-ocaml-dev.install.in
@@ -0,0 +1,8 @@
+ at OCamlStdlibDir@/topfind
+ at OCamlStdlibDir@/findlib/Makefile.config
+ at OCamlStdlibDir@/findlib/findlib_top.cma
+ at OCamlStdlibDir@/findlib/*.cmi
+ at OCamlStdlibDir@/findlib/*.mli
+ at OCamlStdlibDir@/num-top/*
+OPT: @OCamlStdlibDir@/findlib/*.a
+OPT: @OCamlStdlibDir@/findlib/*.cmxa
diff --git a/debian/libfindlib-ocaml-dev.links b/debian/libfindlib-ocaml-dev.links
new file mode 100644
index 0000000..f972b39
--- /dev/null
+++ b/debian/libfindlib-ocaml-dev.links
@@ -0,0 +1,2 @@
+/usr/share/doc/libfindlib-ocaml-dev/ref-html          /usr/share/doc/ocaml-findlib/ref-html
+/usr/share/doc/libfindlib-ocaml-dev/guide-html        /usr/share/doc/ocaml-findlib/guide-html
diff --git a/debian/libfindlib-ocaml.install.in b/debian/libfindlib-ocaml.install.in
new file mode 100644
index 0000000..5de1fcb
--- /dev/null
+++ b/debian/libfindlib-ocaml.install.in
@@ -0,0 +1,4 @@
+etc/ocamlfind.conf
+ at OCamlStdlibDir@/METAS
+ at OCamlStdlibDir@/findlib/META
+ at OCamlStdlibDir@/findlib/findlib.cma
diff --git a/debian/ocaml-findlib-wizard.install.in b/debian/ocaml-findlib-wizard.install.in
new file mode 100644
index 0000000..ccae1f9
--- /dev/null
+++ b/debian/ocaml-findlib-wizard.install.in
@@ -0,0 +1 @@
+ at OCamlStdlibDir@/findlib/make_wizard*
diff --git a/debian/ocaml-findlib.docs b/debian/ocaml-findlib.docs
index af9c686..2469d17 100644
--- a/debian/ocaml-findlib.docs
+++ b/debian/ocaml-findlib.docs
@@ -1,4 +1,2 @@
-doc/guide-html
 doc/QUICKSTART
 doc/README
-doc/ref-html
diff --git a/debian/ocaml-findlib.install b/debian/ocaml-findlib.install
index 8460718..97eca2c 100644
--- a/debian/ocaml-findlib.install
+++ b/debian/ocaml-findlib.install
@@ -1,2 +1,4 @@
-debian/tmp/*		    /
+usr/bin/ocamlfind
+usr/bin/safe_camlp4
+usr/share/man
 debian/bash_completion/*    /etc/bash_completion.d/

-- 
findlib packaging

More information about the Pkg-ocaml-maint-commits mailing list