From: Julien Cristau <jcristau@debian.org>
Date: Sun, 23 Dec 2007 23:54:03 +0000 (+0000)
Subject: * libgraphics.a is built for ocamlc, not ocamlopt.  Install it
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~499
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f457fc2ba446a422eaa103edb402cc3b304215e4;p=ocaml.git

* libgraphics.a is built for ocamlc, not ocamlopt.  Install it
  unconditionally in the ocaml package.  Have ocaml replace ocaml-nox
  because of this move (closes: #457569).  Thanks, Peter Palfrader!
---

diff --git a/debian/changelog b/debian/changelog
index e5b89919..6485b710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml (3.10.0-12) UNRELEASED; urgency=low
+
+  * libgraphics.a is built for ocamlc, not ocamlopt.  Install it
+    unconditionally in the ocaml package.  Have ocaml replace ocaml-nox
+    because of this move (closes: #457569).  Thanks, Peter Palfrader!
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 24 Dec 2007 00:47:43 +0100
+
 ocaml (3.10.0-11) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
diff --git a/debian/control b/debian/control
index 5a45cf19..1ee3ec55 100644
--- a/debian/control
+++ b/debian/control
@@ -82,6 +82,7 @@ Architecture: any
 Depends: ocaml-base (= ${binary:Version}), ocaml-base-${F:OCamlABI}, ocaml-nox-${F:OCamlABI}
 Suggests: tcl8.4-dev, tk8.4-dev
 Provides: ocaml-${F:OCamlABI}
+Replaces: ocaml-nox (<< 3.10.0-12)
 Description: ML language implementation with a class-based object system
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
diff --git a/debian/ocaml-nox.optfiles.in b/debian/ocaml-nox.optfiles.in
index 3871d144..1622f996 100644
--- a/debian/ocaml-nox.optfiles.in
+++ b/debian/ocaml-nox.optfiles.in
@@ -1,5 +1,4 @@
 usr/bin/labltk
-usr/lib/ocaml/#OcamlABI#/libgraphics.a
 usr/lib/ocaml/#OcamlABI#/labltk
 usr/lib/ocaml/#OcamlABI#/graphics.cmx
 usr/lib/ocaml/#OcamlABI#/graphics.cmxa
diff --git a/debian/ocaml.files.in b/debian/ocaml.files.in
index bfb4bede..d7c4e14c 100644
--- a/debian/ocaml.files.in
+++ b/debian/ocaml.files.in
@@ -6,3 +6,4 @@ usr/lib/ocaml/#OcamlABI#/graphicsX11.cmi
 usr/lib/ocaml/#OcamlABI#/graphics.mli
 usr/lib/ocaml/#OcamlABI#/graphicsX11.mli
 usr/lib/ocaml/#OcamlABI#/labltk
+usr/lib/ocaml/#OcamlABI#/libgraphics.a