[Pkg-ocaml-maint-commits] [SCM] ocaml-alsa packaging branch, master, updated. debian/0.1.3-2-3-g2ade233

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 7cedf6169822d9513f445f0e52f3297be92aafa3
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 09:38:45 2009 +0100

    Update package.

diff --git a/debian/changelog b/debian/changelog
index 2c8ba65..79dc2b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ocaml-alsa (0.1.3-3) UNRELEASED; urgency=low
 
-  * Switch packaging to git
+  * Switch packaging to git.
+  * Use dh-ocaml.
+  * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 13:32:59 +0100
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 09:35:53 +0100
 
 ocaml-alsa (0.1.3-2) experimental; urgency=low
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 5f7ad3d..4c8f31d 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-1.1), debhelper (>= 4.2.0), ocaml-nox (>= 3.11.0-1), pkg-config, libasound2-dev, ocaml-findlib (>= 1.2.3), dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), pkg-config, libasound2-dev, ocaml-findlib (>= 1.2.4), dh-ocaml
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-alsa.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-alsa.git
diff --git a/debian/control.in b/debian/control.in
index bcb184b..37dc29a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,10 +3,10 @@ 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@, pkg-config, libasound2-dev, ocaml-findlib (>= 1.2.3), dh-ocaml
+Build-Depends: @cdbs@, debhelper (>= 7), pkg-config, libasound2-dev, ocaml-findlib (>= 1.2.4), dh-ocaml
 Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-alsa.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-alsa.git
 
 Package: libalsa-ocaml
 Section: libs
diff --git a/debian/libalsa-ocaml-dev.install.in b/debian/libalsa-ocaml-dev.install.in
index 37bed9a..f3b36cc 100644
--- a/debian/libalsa-ocaml-dev.install.in
+++ b/debian/libalsa-ocaml-dev.install.in
@@ -1 +1 @@
-src/META src/*.a src/*.cm* usr/lib/ocaml/@OCamlABI@/alsa
+src/META src/*.a src/*.cm* @OCamlStdlibDir@/alsa
diff --git a/debian/libalsa-ocaml.install.in b/debian/libalsa-ocaml.install.in
index de5ee53..d9840cf 100644
--- a/debian/libalsa-ocaml.install.in
+++ b/debian/libalsa-ocaml.install.in
@@ -1 +1 @@
-src/dllalsa_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+src/dllalsa_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 42840ef..5f43bcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,13 @@
 
 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
 
 build/libalsa-ocaml-dev::

-- 
ocaml-alsa packaging