[Pkg-ocaml-maint-commits] [SCM] ocaml-magic packaging branch, master, updated. debian/0.7.3-3-2-g558938b

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 558938b7cf69f0f2b5db7fc8101837250232ae36
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 22:41:17 2009 +0100

    Update package.

diff --git a/debian/changelog b/debian/changelog
index a990a05..9294f1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-ocaml-magic (0.7.3-4) UNRELEASED; urgency=low
+ocaml-magic (0.7.3-4) unstable; urgency=low
 
-  * Switch packaging to git
+  * Rebuild with OCaml 3.11.
+  * Switch packaging to git.
+  * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 18:37:37 +0100
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 22:39:31 +0100
 
 ocaml-magic (0.7.3-3) experimental; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 80bed07..288858c 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 (>= 5), ocaml-nox (>= 3.11.0-1), libmagic-dev, ocaml-findlib (>= 1.2.3-1), dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libmagic-dev, ocaml-findlib (>= 1.2.4), dh-ocaml
 Standards-Version: 3.8.0
 Homepage: http://sourceforge.net/projects/ocaml-magic/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-magic.git
diff --git a/debian/control.in b/debian/control.in
index 832d749..f38fd55 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,11 +3,11 @@ 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@, libmagic-dev, ocaml-findlib (>= 1.2.1-6), dh-ocaml
+Build-Depends: @cdbs@, debhelper (>= 7), libmagic-dev, ocaml-findlib (>= 1.2.4), dh-ocaml
 Standards-Version: 3.8.0
 Homepage: http://sourceforge.net/projects/ocaml-magic/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-magic.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-magic.git
 
 Package: libmagic-ocaml
 Architecture: any
diff --git a/debian/libmagic-ocaml-dev.install.in b/debian/libmagic-ocaml-dev.install.in
index 8a6de38..221b2d0 100644
--- a/debian/libmagic-ocaml-dev.install.in
+++ b/debian/libmagic-ocaml-dev.install.in
@@ -1 +1 @@
-src/META src/*.a src/*.cm* usr/lib/ocaml/@OCamlABI@/magic/
+src/META src/*.a src/*.cm* @OCamlStdlibDir@/magic/
diff --git a/debian/libmagic-ocaml.install.in b/debian/libmagic-ocaml.install.in
index fa3a3cf..0514e51 100644
--- a/debian/libmagic-ocaml.install.in
+++ b/debian/libmagic-ocaml.install.in
@@ -1 +1 @@
-src/dllmagic_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+src/dllmagic_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 3f1c8b9..ee08876 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/libmagic-ocaml-dev::

-- 
ocaml-magic packaging