[Pkg-ocaml-maint-commits] [SCM] core packaging branch, master, updated. 55be1571208d85f214947a83117694fd2609a33f

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 55be1571208d85f214947a83117694fd2609a33f
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun May 4 12:56:19 2008 +0200

    arch-optional deps on bin_prot

diff --git a/debian/control b/debian/control
index 2347004..12f5d76 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Stefano Zacchiroli <zack at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), dpatch,
  ocaml-nox, camlp4, ocaml-findlib,
  libtype-conv-camlp4-dev,
- libbin-prot-camlp4-dev,
+ libbin-prot-camlp4-dev [i386 amd64],
  libsexplib-camlp4-dev,
  libres-ocaml-dev,
  libounit-ocaml-dev
@@ -17,10 +17,10 @@ Homepage: http://www.janestcapital.com/ocaml/
 
 Package: libcore-ocaml-dev
 Section: libdevel
-Architecture: any
+Architecture: i386 amd64
 Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
  libcore-ocaml (= ${binary:Version}),
- libbin-prot-camlp4-dev,
+ ${F:OCamlArchDeps},
  libsexplib-camlp4-dev,
  libres-ocaml-dev,
  ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 590e31d..36d0617 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,11 @@ DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
 DEST_DIR = $(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
 DEST_DLL_DIR = $(CURDIR)/debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR)
 
+# dependency on bin_prot is there only on archs supported by it
+ifneq (,$(findstring $(DEB_HOST_ARCH),i386 amd64))
+DEB_DH_GENCONTROL_ARGS += -VF:OCamlArchDeps="libbin-prot-camlp4-dev"
+endif
+
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all
 DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"

-- 
core packaging