This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch debian/experimental
in repository ocaml.
commit 282587faf55218be9ee74aa9b32200358292e664
Author: Ximin Luo <infini...@debian.org>
Date: Fri Mar 3 14:15:56 2017 +0100
Merge ocaml-native-compilers into ocaml-nox
---
debian/changelog | 1 +
debian/control | 23 ++---------------------
debian/control.in | 23 ++---------------------
debian/ocaml-base-nox.README.Debian | 2 --
debian/ocaml-native-compilers.install | 12 ------------
debian/ocaml-native-compilers.links | 5 -----
debian/ocaml-nox.install.in | 12 ++++++++++++
debian/rules | 7 ++-----
8 files changed, 19 insertions(+), 66 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e90f8d8..c148d2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ocaml (4.04.0-1) UNRELEASED; urgency=medium
[ Ximin Luo ]
* New upstream release.
+ * Merge ocaml-native-compilers into ocaml-nox.
-- Ximin Luo <infini...@debian.org> Sun, 06 Nov 2016 19:58:56 +0100
diff --git a/debian/control b/debian/control
index 64902a0..c1305ee 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,8 @@ Depends:
binutils
Provides:
${ocaml:Provides},
- ${F:BestProvides},
+ ocaml-best-compilers (= ${binary:Version}),
+ ${F:NativeProvides},
libnums-ocaml-dev
Suggests:
ocaml-doc,
@@ -146,26 +147,6 @@ Description: Runtime system for OCaml bytecode executables
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: amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386
kfreebsd-amd64 lpia powerpc ppc64 ppc64el sparc s390x
-Depends:
- ocaml-nox (= ${binary:Version}),
- gcc, binutils,
- ${shlibs:Depends},
- ${misc:Depends}
-Provides: ocaml-best-compilers (= ${binary:Version})
-Replaces: ocaml-nox (<= 3.09.2-3)
-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
- (ocamlc.opt, ocamllex.opt, ocamlopt.opt. 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.
-
Package: ocaml-source
Architecture: all
Depends: ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index 91de587..ba3dae3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -37,7 +37,8 @@ Depends:
binutils
Provides:
${ocaml:Provides},
- ${F:BestProvides},
+ ocaml-best-compilers,
+ ${F:NativeProvides},
libnums-ocaml-dev
Suggests:
ocaml-doc,
@@ -146,26 +147,6 @@ Description: Runtime system for OCaml bytecode executables
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}),
- gcc, binutils,
- ${shlibs:Depends},
- ${misc:Depends}
-Provides: ocaml-best-compilers (= ${binary:Version})
-Replaces: ocaml-nox (<= 3.09.2-3)
-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
- (ocamlc.opt, ocamllex.opt, ocamlopt.opt. 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.
-
Package: ocaml-source
Architecture: all
Depends: ${misc:Depends}
diff --git a/debian/ocaml-base-nox.README.Debian
b/debian/ocaml-base-nox.README.Debian
index 6497fcf..cda8aaf 100644
--- a/debian/ocaml-base-nox.README.Debian
+++ b/debian/ocaml-base-nox.README.Debian
@@ -8,8 +8,6 @@ OCaml for Debian
o ocaml-base: contains the runtime stuff (ocamlrun + dlls + Tk)
o ocaml-base-nox: contains the runtime stuff (ocamlrun + dlls - Tk)
- o ocaml-native-compilers: contains the native built part of the OCaml suite
- (ocamlc.opt, ocamlopt.opt, ocamllex.opt)
o ocaml-compiler-libs: 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
diff --git a/debian/ocaml-native-compilers.install
b/debian/ocaml-native-compilers.install
deleted file mode 100644
index 438b2f4..0000000
--- a/debian/ocaml-native-compilers.install
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/bin/ocamlc.opt
-usr/bin/ocamlcp.opt
-usr/bin/ocamldep.opt
-usr/bin/ocamldoc.opt
-usr/bin/ocamllex.opt
-usr/bin/ocamlopt.opt
-usr/bin/ocamloptp.opt
-usr/bin/ocamlmklib.opt
-usr/bin/ocamlmktop.opt
-usr/bin/ocamlprof.opt
-usr/bin/ocamlobjinfo.opt
-debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/
diff --git a/debian/ocaml-native-compilers.links
b/debian/ocaml-native-compilers.links
deleted file mode 100644
index 6367664..0000000
--- a/debian/ocaml-native-compilers.links
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/man/man1/ocamlc.1.gz usr/share/man/man1/ocamlc.opt.1.gz
-usr/share/man/man1/ocamldep.1.gz usr/share/man/man1/ocamldep.opt.1.gz
-usr/share/man/man1/ocamldoc.1.gz usr/share/man/man1/ocamldoc.opt.1.gz
-usr/share/man/man1/ocamllex.1.gz usr/share/man/man1/ocamllex.opt.1.gz
-usr/share/man/man1/ocamlopt.1.gz usr/share/man/man1/ocamlopt.opt.1.gz
diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 46b820d..eac29e2 100644
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -9,6 +9,18 @@
usr/bin/ocamlprof
usr/bin/ocamlyacc
usr/bin/ocamlobjinfo
+ usr/bin/ocamlc.*
+ usr/bin/ocamlcp.*
+ usr/bin/ocamldep.*
+ usr/bin/ocamldoc.*
+ usr/bin/ocamllex.*
+ usr/bin/ocamlopt.*
+ usr/bin/ocamloptp.*
+ usr/bin/ocamlmklib.*
+ usr/bin/ocamlmktop.*
+ usr/bin/ocamlprof.*
+ usr/bin/ocamlobjinfo.*
+debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/
@OCamlStdlibDir@/objinfo_helper
debian/native-archs @OCamlStdlibDir@
OPT: usr/bin/ocamlopt
diff --git a/debian/rules b/debian/rules
index 053cf10..0c7f4c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,6 @@ export OCAMLOBJINFO = OCAMLLIB=tools boot/ocamlrun
tools/objinfo
#export DH_VERBOSE=1
export DH_OPTIONS
-ifeq ($(OCAML_OPT_ARCH),)
- DH_OPTIONS += -Nocaml-native-compilers
-endif
# This has to be exported to make gen_modules work
export OCAML_OPT_ARCH
@@ -248,9 +245,9 @@ override_dh_gencontrol:
echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
done
ifeq (,$(OCAML_OPT_ARCH))
- echo 'F:BestProvides=ocaml-best-compilers (= $${binary:Version})' >>
debian/ocaml-nox.substvars
+ echo 'F:NativeProvides=' >> debian/ocaml-nox.substvars
else
- echo 'F:BestProvides=' >> debian/ocaml-nox.substvars
+ echo 'F:NativeProvides=ocaml-native-compilers (= $${binary:Version})'
>> debian/ocaml-nox.substvars
endif
# Create .md5sums files and compute dependencies. Use $(OCAML_ABI)
# because we know that OCaml ABI represents best dependencies for
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
