[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.3-1-12-g98f4046

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 98f4046ffafcd7e3d6bd3237891cc3217fda863d
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Nov 10 17:48:08 2009 +0100

    switch packaging to dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index bf0b563..cfa4312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ janest-core (0.6.0-1) UNRELEASED; urgency=low
     - patches/0003-add-missing-META-dep-on-unix
     - patches/0004-Fix-build-on-kfreebsd
   * debian/control: add (new) build-dep on libfields-camlp4-dev
+  * debian/rules: switch {debhelper,ocaml}.mk to avoid *.log leftovers
+  * switch packaging to dh-ocaml
 
  -- Stefano Zacchiroli <zack at debian.org>  Sun, 08 Nov 2009 23:20:44 +0100
 
diff --git a/debian/control b/debian/control
index 16560cd..7a9277f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  libbin-prot-camlp4-dev (>= 1.2.10),
  libsexplib-camlp4-dev (>= 4.2.6-3),
  libres-ocaml-dev (>= 3.1.1),
- lifields-camlp4-dev,
+ libfields-camlp4-dev,
  libounit-ocaml-dev
 Standards-Version: 3.8.3
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/janest-core.git
@@ -27,14 +27,11 @@ Homepage: http://www.janestcapital.com/ocaml/
 Package: libcore-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
  ocaml-findlib,
- libcore-ocaml (= ${binary:Version}),
- ${F:OCamlArchDeps},
- libsexplib-camlp4-dev,
- libres-ocaml-dev,
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: Jane Street Capital's alternative standard library for OCaml
  Core is Jane Street Capital's alternative standard library for OCaml.
  .
@@ -54,10 +51,11 @@ Description: Jane Street Capital's alternative standard library for OCaml
 Package: libcore-ocaml
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
  ocaml-findlib,
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: Jane Street Capital's core library for OCaml (runtime)
  Core is Jane Street Capital's alternative standard library for OCaml.
  .
diff --git a/debian/rules b/debian/rules
index 43a9c0d..271bdf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,14 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 LIB_NAME = core
 DLL_PKG_NAME = lib$(LIB_NAME)-ocaml
 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)
-DEB_DH_GENCONTROL_ARGS += -VF:OCamlArchDeps="libbin-prot-camlp4-dev"
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all

-- 
janest-core packaging