[Pkg-ocaml-maint-commits] r5469 - in /trunk/packages/ocaml/trunk/debian: changelog control control.in
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Sun Apr 13 14:56:34 UTC 2008
Author: toots
Date: Sun Apr 13 14:56:33 2008
New Revision: 5469
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5469
Log:
Changed internal dependencies to remove virtual packages. Should help builds in experimental and backports.org
Also backported OCaml spelling changes to control.in.
Modified:
trunk/packages/ocaml/trunk/debian/changelog
trunk/packages/ocaml/trunk/debian/control
trunk/packages/ocaml/trunk/debian/control.in
Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=5469&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Sun Apr 13 14:56:33 2008
@@ -1,8 +1,13 @@
ocaml (3.10.2-2) UNRELEASED; urgency=low
+ [ Stefano Zacchiroli ]
* fix "OCaml" spelling errors in package descriptions (thanks lintian!)
- -- Stefano Zacchiroli <zack at debian.org> Mon, 03 Mar 2008 11:52:03 +0100
+ [ Romain Beauxis ]
+ * removed virtual package from internal dependencies in favour of strict
+ versioned dependencies. Prevents build failures under some situations.
+
+ -- Romain Beauxis <toots at rastageeks.org> Sun, 13 Apr 2008 16:53:04 +0100
ocaml (3.10.2-1) experimental; urgency=low
Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=5469&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Sun Apr 13 14:56:33 2008
@@ -11,7 +11,7 @@
Package: ocaml-nox
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-base-nox-${F:OCamlABI}, ocaml-interp-${F:OCamlABI}, gcc, binutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc, binutils
Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
Recommends: camlp4, ledit, file
Provides: ocaml-nox-${F:OCamlABI}, ${F:BestProvides}, libnums-ocaml-dev
@@ -42,7 +42,7 @@
Package: camlp4
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-nox (=${binary:Version})
Provides: camlp4-${F:OCamlABI}
Description: Pre Processor Pretty Printer for OCaml
Objective Caml (OCaml) is an implementation of the ML language,
@@ -61,7 +61,7 @@
Package: camlp4-extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, camlp4-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, camlp4 (=${binary:Version})
Description: Pre Processor Pretty Printer for OCaml - extras
Objective Caml (OCaml) is an implementation of the ML language,
based on the Caml Light dialect extended with a complete
@@ -79,7 +79,7 @@
Package: ocaml
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base (= ${binary:Version}), ocaml-base-${F:OCamlABI}, ocaml-nox-${F:OCamlABI}, libx11-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base (= ${binary:Version}), ocaml-nox (=${binary:Version}), libx11-dev
Suggests: tcl8.4-dev, tk8.4-dev
Provides: ocaml-${F:OCamlABI}
Replaces: ocaml-nox (<< 3.10.0-12)
@@ -123,7 +123,7 @@
Package: ocaml-base
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox (=${binary:Version})
Provides: ocaml-base-${F:OCamlABI}
Description: Runtime system for OCaml bytecode executables
Objective Caml (OCaml) is an implementation of the ML language, based on
@@ -137,7 +137,7 @@
Package: ocaml-native-compilers
Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
-Depends: ocaml-nox (= ${binary:Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (= ${binary:Version}), gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
Provides: ocaml-best-compilers
Replaces: ocaml-nox (<= 3.09.2-3)
Description: Native code compilers of the OCaml suite (the .opt ones)
@@ -166,7 +166,7 @@
Package: ocaml-interp
Architecture: any
Provides: ocaml-interp-${F:OCamlABI}
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: ledit
Replaces: ocaml (<< 3.07.2a-3)
Conflicts: ocaml (<< 3.07.2a-3)
@@ -181,7 +181,7 @@
Package: ocaml-compiler-libs
Architecture: any
Provides: ocaml-compiler-libs-${F:OCamlABI}
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: OCaml interpreter and standard libraries
Objective (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/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control.in?rev=5469&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control.in (original)
+++ trunk/packages/ocaml/trunk/debian/control.in Sun Apr 13 14:56:33 2008
@@ -11,7 +11,7 @@
Package: ocaml-nox
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-base-nox-${F:OCamlABI}, ocaml-interp-${F:OCamlABI}, gcc, binutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc, binutils
Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
Recommends: camlp4, ledit, file
Provides: ocaml-nox-${F:OCamlABI}, ${F:BestProvides}, libnums-ocaml-dev
@@ -37,12 +37,12 @@
the moderate memory requirements of the bytecode compiler. It is not
available on all arches though.
.
- This package contains everything needed to develop ocaml applications
+ This package contains everything needed to develop OCaml applications
that do not require the graphics library.
Package: camlp4
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-nox (=${binary:Version})
Provides: camlp4-${F:OCamlABI}
Description: Pre Processor Pretty Printer for OCaml
Objective Caml (OCaml) is an implementation of the ML language,
@@ -61,7 +61,7 @@
Package: camlp4-extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, camlp4-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, camlp4 (=${binary:Version})
Description: Pre Processor Pretty Printer for OCaml - extras
Objective Caml (OCaml) is an implementation of the ML language,
based on the Caml Light dialect extended with a complete
@@ -79,7 +79,7 @@
Package: ocaml
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base (= ${binary:Version}), ocaml-base-${F:OCamlABI}, ocaml-nox-${F:OCamlABI}, libx11-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base (= ${binary:Version}), ocaml-nox (=${binary:Version}), libx11-dev
Suggests: tcl8.4-dev, tk8.4-dev
Provides: ocaml-${F:OCamlABI}
Replaces: ocaml-nox (<< 3.10.0-12)
@@ -103,7 +103,7 @@
the moderate memory requirements of the bytecode compiler. It is not
available on all arches though.
.
- This package contains everything needed to develop ocaml applications,
+ This package contains everything needed to develop OCaml applications,
including the graphics libraries.
Package: ocaml-base-nox
@@ -112,42 +112,42 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ocaml-base (<< 3.07.2a-3), libnums-ocaml
Conflicts: ocaml (<< 3.04-2), ocaml-base (<< 3.07.2a-3), libnums-ocaml
-Description: Runtime system for ocaml bytecode executables
+Description: Runtime system for OCaml bytecode executables
Objective Caml (OCaml) is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
and a powerful module system in the style of Standard ML.
.
This package contains only the runtime system needed to run bytecode
- executables that do not use the graphics library. The `ocaml' package
+ executables that do not use the graphics library. The 'ocaml' package
contains the full development suite of Objective Caml.
Package: ocaml-base
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox (=${binary:Version})
Provides: ocaml-base-${F:OCamlABI}
-Description: Runtime system for ocaml bytecode executables
+Description: Runtime system for OCaml bytecode executables
Objective Caml (OCaml) is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
and a powerful module system in the style of Standard ML.
.
This package contains only the runtime system needed to run bytecode
- executables. The `ocaml' package contains the full development suite of
+ executables. The 'ocaml' package contains the full development suite of
Objective Caml. You may wish to install the 'ocaml-base-nox' package if
you do not require any graphical capabilities for your runtime.
Package: ocaml-native-compilers
Architecture: #OcamlNativeArchs#
-Depends: ocaml-nox (= ${binary:Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (= ${binary:Version}), gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
Provides: ocaml-best-compilers
Replaces: ocaml-nox (<= 3.09.2-3)
-Description: Native code compilers of the ocaml suite (the .opt ones)
+Description: Native code compilers of the OCaml suite (the .opt ones)
Objective Caml (OCaml) is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
and a powerful module system in the style of Standard ML.
.
This package contains the native code version of the compilers and lexer
(ocamlc.opt, ocamllex.opt, ocamlopt.opt, camlp4o.opt and camlp4r.opt).
- The normal version of these programs are found in the ocaml package.
+ The normal version of these programs are found in the 'ocaml' package.
For big source codes, these packages can be two to three times faster, but
for most normal sized sources, the difference won't be noticeable.
@@ -160,13 +160,13 @@
and a powerful module system in the style of Standard ML.
.
This package contains the sources needed to build some packages which build
- depend on the ocaml source. Notice that if you want to rebuild ocaml, these
+ depend on the OCaml source. Notice that if you want to rebuild OCaml, these
will not work, consider using the source package instead.
Package: ocaml-interp
Architecture: any
Provides: ocaml-interp-${F:OCamlABI}
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: ledit
Replaces: ocaml (<< 3.07.2a-3)
Conflicts: ocaml (<< 3.07.2a-3)
@@ -175,20 +175,20 @@
the Caml Light dialect extended with a complete class-based object system
and a powerful module system in the style of Standard ML.
.
- This package contains the files required to run an ocaml shell from the
+ This package contains the files required to run an OCaml shell from the
command line.
Package: ocaml-compiler-libs
Architecture: any
Provides: ocaml-compiler-libs-${F:OCamlABI}
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: OCaml interpreter and standard libraries
Objective (OCaml) is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
and a powerful module system in the style of Standard ML.
.
- This package contains several modules used internally by the ocaml
- compilers. They are not needed for normal ocaml development, but may
+ This package contains several modules used internally by the OCaml
+ compilers. They are not needed for normal OCaml development, but may
be helpful in the development of certain applications.
Package: ocaml-mode
More information about the Pkg-ocaml-maint-commits
mailing list