[Pkg-ocaml-maint-commits] [SCM] ocaml-ao packaging branch, master, updated. debian/0.1.9-2-2-g71fc7bc

[Samuel Mimram]

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

    Update package.

diff --git a/debian/changelog b/debian/changelog
index 7f52842..0131b0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-ocaml-ao (0.1.9-3) UNRELEASED; urgency=low
+ocaml-ao (0.1.9-3) unstable; urgency=low
 
-  * Switch packaging to git
+  * Switch packaging to git.
+  * Rebuild with OCaml 3.11.
 
  -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 14:48:37 +0100
 
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 f36c541..517e506 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), libao-dev, ocaml-findlib (>= 1.2.3), pkg-config, dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libao-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
 Standards-Version: 3.8.0
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-ao.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ao.git
diff --git a/debian/control.in b/debian/control.in
index c632e7d..ad52cb4 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@, libao-dev, ocaml-findlib (>= 1.2.3), pkg-config, dh-ocaml
+Build-Depends: @cdbs@, debhelper (>= 7), libao-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
 Standards-Version: 3.8.0
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-ao.git
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ao.git
 
 Package: libao-ocaml
 Section: libs
diff --git a/debian/libao-ocaml-dev.install.in b/debian/libao-ocaml-dev.install.in
index 5691dde..28a53a7 100644
--- a/debian/libao-ocaml-dev.install.in
+++ b/debian/libao-ocaml-dev.install.in
@@ -1 +1 @@
-src/META src/*.a src/*.cm* usr/lib/ocaml/@OCamlABI@/ao
+src/META src/*.a src/*.cm* @OCamlStdlibDir@/ao
diff --git a/debian/libao-ocaml.install.in b/debian/libao-ocaml.install.in
index e3008a7..dbb9228 100644
--- a/debian/libao-ocaml.install.in
+++ b/debian/libao-ocaml.install.in
@@ -1 +1 @@
-src/dllao_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+src/dllao_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 6217e05..9ac0283 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/libao-ocaml-dev::

-- 
ocaml-ao packaging