[Pkg-ocaml-maint-commits] [SCM] ocaml-duppy packaging branch, master, updated. debian/0.1.1-1-14-g5bc2062

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 5bc2062c2b68c781a1bccd1d82e37c0d7d9d7dda
Author: Samuel Mimram <smimram at debian.org>
Date:   Mon Feb 23 14:33:46 2009 +0100

    Use dh-ocaml's predefined variables.

diff --git a/debian/changelog b/debian/changelog
index d9b2ab9..dc1a175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ ocaml-duppy (0.2.0-1) UNRELEASED; urgency=low
 
   * New Upstream Version.
   * Switch packaging to git.
+  * Use dh-ocaml's predefined variables.
   * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 14:30:14 +0100
+ -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 14:31:03 +0100
 
 ocaml-duppy (0.1.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 023a248..05a45aa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
-Build-Depends: cdbs (>= 0.4.23), debhelper (>= 5), ocaml-nox, ocaml-findlib, libpcre-ocaml-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox, debhelper (>= 7), dh-ocaml, ocaml-findlib, libpcre-ocaml-dev
 Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-duppy.git
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-duppy.git
 Package: libduppy-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libpcre-ocaml-dev
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libpcre-ocaml-dev, ${misc:Depends}
 Description: Advanced scheduler for OCaml
  Duppy is an event scheduler written for OCaml. It allows the user
  to execute tasks according to some events on unix sockets, or 
diff --git a/debian/control.in b/debian/control.in
index e06d78a..58ad920 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,16 +3,16 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
-Build-Depends: @cdbs@, debhelper (>= 7), ocaml-findlib, libpcre-ocaml-dev
+Build-Depends: @cdbs@, debhelper (>= 7), dh-ocaml, ocaml-findlib, libpcre-ocaml-dev
 Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-duppy/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-duppy/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-duppy.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-duppy.git
 
 Package: libduppy-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libpcre-ocaml-dev
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libpcre-ocaml-dev, ${misc:Depends}
 Description: Advanced scheduler for OCaml
  Duppy is an event scheduler written for OCaml. It allows the user
  to execute tasks according to some events on unix sockets, or 
diff --git a/debian/libduppy-ocaml-dev.install.in b/debian/libduppy-ocaml-dev.install.in
index 3c38804..658676a 100644
--- a/debian/libduppy-ocaml-dev.install.in
+++ b/debian/libduppy-ocaml-dev.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/duppy/*
+ at OCamlStdlibDir@/duppy/*
diff --git a/debian/rules b/debian/rules
index a27e8f0..58bfb82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,14 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 # In order to regenerate 'debian/control' :
 #   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
 # Then check manually if everything's ok
 
-DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_INSTALL_ARGS :=  --list-missing
 
 build/libduppy-ocaml-dev::

-- 
ocaml-duppy packaging