[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0.rc1-1-8-g6032225

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 455d322438903b96aa138c660141351c11266219
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Apr 29 07:28:39 2010 +0200

    Install usb.cmxs and move usb.cma and META to runtime package

diff --git a/debian/control b/debian/control
index 99f35d1..5673149 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,8 @@ Depends:
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Replaces: libusb-ocaml-dev (<< 1.0)
+Conflicts: libusb-ocaml-dev (<< 1.0)
 Provides: ${ocaml:Provides}
 Description: OCaml bindings to libusb-1.0 (runtime)
  OCaml-USB is a binding to libusb-1.0, a userspace USB programming
diff --git a/debian/libusb-ocaml-dev.install.in b/debian/libusb-ocaml-dev.install.in
index eb68273..ec3241b 100644
--- a/debian/libusb-ocaml-dev.install.in
+++ b/debian/libusb-ocaml-dev.install.in
@@ -1,7 +1,5 @@
 _build/usb.docdir/*.html          usr/share/doc/libusb-ocaml-dev/html/api
 _build/usb.docdir/*.css           usr/share/doc/libusb-ocaml-dev/html/api
- at OCamlStdlibDir@/usb/META
- at OCamlStdlibDir@/usb/*.cma
 @OCamlStdlibDir@/usb/*.cmi
 @OCamlStdlibDir@/usb/*.mli
 @OCamlStdlibDir@/usb/*.a
diff --git a/debian/libusb-ocaml.install.in b/debian/libusb-ocaml.install.in
index 1d5ce78..32bf0d0 100644
--- a/debian/libusb-ocaml.install.in
+++ b/debian/libusb-ocaml.install.in
@@ -1 +1,4 @@
 @OCamlDllDir@/*.so
+ at OCamlStdlibDir@/usb/META
+ at OCamlStdlibDir@/usb/*.cma
+OPT: @OCamlStdlibDir@/usb/*.cmxs

-- 
ocaml-usb packaging