[Pkg-xen-changes] [xen] 02/02: Remove broken and unused OCaml-support

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch develop
in repository xen.

commit b8184be249c5a15aa381f73e2cbb986b791bc197
Author: Bastian Blank <waldi at debian.org>
Date:   Mon Aug 18 09:42:35 2014 +0200

    Remove broken and unused OCaml-support
---
 debian/changelog                   |  6 ++++++
 debian/rules.real                  | 35 +----------------------------------
 debian/templates/control.source.in |  3 ---
 3 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f0adaa..c593eaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xen (4.4.0-2) UNRELEASED; urgency=medium
+
+  * Remove broken and unused OCaml-support.
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 18 Aug 2014 09:41:28 +0200
+
 xen (4.4.0-1) unstable; urgency=medium
 
   [ Bastian Blank ]
diff --git a/debian/rules.real b/debian/rules.real
index b92fb51..bf1abd5 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -1,5 +1,4 @@
 include /usr/share/dpkg/default.mk
-include /usr/share/ocaml/ocamlvars.mk
 
 export DH_OPTIONS
 
@@ -17,8 +16,6 @@ binary-arch-arch: install-libxen-dev_$(ARCH)
 binary-arch-arch: install-libxenstore_$(ARCH)
 binary-arch-arch: install-utils_$(ARCH)
 binary-arch-arch: install-xenstore-utils_$(ARCH)
-binary-arch-arch: install-lib-ocaml-dev_$(ARCH)
-binary-arch-arch: install-lib-ocaml_$(ARCH)
 binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
 
 binary-indep: install-utils-common
@@ -70,6 +67,7 @@ $(STAMPS_DIR)/setup-utils_$(ARCH):
 			--sysconfdir=/etc \
 			--localstatedir=/var \
 			--disable-blktap1 \
+			--disable-ocamltools \
 			--disable-qemu-traditional --disable-rombios \
 			--with-system-qemu=/usr/bin/qemu-system-i386 \
 			--with-system-seabios=/usr/share/seabios/bios.bin
@@ -180,37 +178,6 @@ install-libxen-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
 	dh_shlibdeps
 	+$(MAKE_SELF) install-base
 
-install-lib-ocaml_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
-install-lib-ocaml_$(ARCH): PACKAGE_NAME = libxen-ocaml
-install-lib-ocaml_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-lib-ocaml_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH)
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/META
-	dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cma
-	dh_install --sourcedir=$(DIR) -X.so.owner ./$(OCAML_DLL_DIR)/*
-	dh_strip
-	dh_shlibdeps
-	dh_ocaml
-	+$(MAKE_SELF) install-base
-
-install-lib-ocaml-dev_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
-install-lib-ocaml-dev_$(ARCH): PACKAGE_NAME = libxen-ocaml-dev
-install-lib-ocaml-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-lib-ocaml-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cmx
-	dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cmxa
-	dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.cmi
-	dh_install --sourcedir=$(DIR) ./$(OCAML_STDLIB_DIR)/*/*.a
-	dh_strip
-	dh_shlibdeps
-	dh_ocaml
-	+$(MAKE_SELF) install-base
-
 install-libxenstore_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
 install-libxenstore_$(ARCH): PACKAGE_NAME = libxenstore3.0
 install-libxenstore_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 34b123f..cc270ad 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -25,9 +25,6 @@ Build-Depends:
  pkg-config,
  uuid-dev,
  zlib1g-dev,
- ocaml-nox [!arm64],
- dh-ocaml [!arm64],
- ocaml-findlib [!arm64]
 Standards-Version: 3.9.4
 XS-Python-Version: current
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git