[Pkg-ocaml-maint-commits] [SCM] ocaml-mad packaging branch, master, updated. debian/0.3.5-1-8-g3ca8f3e

[Samuel Mimram]

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

    Update package.

diff --git a/debian/changelog b/debian/changelog
index f7ba1d4..55cfa8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ocaml-mad (0.3.5-2) UNRELEASED; urgency=low
 
   * Switch packaging to git
+  * Rebuild with OCaml 3.11.
+  * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 12:19:34 +0100
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 09:25:08 +0100
 
 ocaml-mad (0.3.5-1) 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 bac3704..0bbf7b6 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: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org> 
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), ocaml-nox (>= 3.11.0-1), libmad0-dev, ocaml-findlib (>= 1.2.3), pkg-config, dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), libmad0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mad.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-mad.git
diff --git a/debian/control.in b/debian/control.in
index aeffbb3..301340d 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: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org> 
-Build-Depends: @cdbs@, libmad0-dev, ocaml-findlib, pkg-config, dh-ocaml
+Build-Depends: @cdbs@, libmad0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
 Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mad.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-mad.git
 
 Package: libmad-ocaml
 Section: libs
diff --git a/debian/libmad-ocaml-dev.install.in b/debian/libmad-ocaml-dev.install.in
index c549e57..860a4b9 100644
--- a/debian/libmad-ocaml-dev.install.in
+++ b/debian/libmad-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/META
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.a
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.cm*
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.ml*
+ at OCamlStdlibDir@/mad/META
+ at OCamlStdlibDir@/mad/*.a
+ at OCamlStdlibDir@/mad/*.cm*
+ at OCamlStdlibDir@/mad/*.ml*
diff --git a/debian/libmad-ocaml.install.in b/debian/libmad-ocaml.install.in
index d7ff1bf..6fdbf6f 100644
--- a/debian/libmad-ocaml.install.in
+++ b/debian/libmad-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/dllmad_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/mad/dllmad_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 6add2ad..16f597a 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/libmad-ocaml-dev::

-- 
ocaml-mad packaging