[Pkg-ocaml-maint-commits] r4928 - in /trunk/packages/ocaml/trunk/debian: changelog control ocaml-nox.optfiles.in ocaml.files.in

[jcristau at users.alioth.debian.org]

Author: jcristau
Date: Sun Dec 23 23:54:03 2007
New Revision: 4928

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4928
Log:
* 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!

Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/control
    trunk/packages/ocaml/trunk/debian/ocaml-nox.optfiles.in
    trunk/packages/ocaml/trunk/debian/ocaml.files.in

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4928&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Sun Dec 23 23:54:03 2007
@@ -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 at debian.org>  Mon, 24 Dec 2007 00:47:43 +0100
+
 ocaml (3.10.0-11) unstable; urgency=low
 
   [ Stefano Zacchiroli ]

Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=4928&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Sun Dec 23 23:54:03 2007
@@ -82,6 +82,7 @@
 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

Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.optfiles.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.optfiles.in?rev=4928&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.optfiles.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.optfiles.in Sun Dec 23 23:54:03 2007
@@ -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

Modified: trunk/packages/ocaml/trunk/debian/ocaml.files.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml.files.in?rev=4928&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.files.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml.files.in Sun Dec 23 23:54:03 2007
@@ -6,3 +6,4 @@
 usr/lib/ocaml/#OcamlABI#/graphics.mli
 usr/lib/ocaml/#OcamlABI#/graphicsX11.mli
 usr/lib/ocaml/#OcamlABI#/labltk
+usr/lib/ocaml/#OcamlABI#/libgraphics.a