[Pkg-ocaml-maint-commits] [SCM] ocaml-bjack packaging branch, master, updated. upstream/0.1.1-7-g04a7c8b

[Samuel Mimram]

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

    Update package.

diff --git a/debian/changelog b/debian/changelog
index 16c14ce..0100256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-ocaml-bjack (0.1.1-3) UNRELEASED; urgency=low
+ocaml-bjack (0.1.2-1) unstable; urgency=low
 
-  * Switch packaging to git
+  * New Upstream Version.
+  * Switch packaging to git.
+  * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 00:01:00 +0100
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 09:54:37 +0100
 
 ocaml-bjack (0.1.1-2) 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 e65f268..6980b79 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ 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 (>= 5), ocaml-nox (>= 3.11.0-1), libjack-dev, libsamplerate0-dev, ocaml-findlib (>= 1.2.3), pkg-config, dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libjack-dev, libsamplerate0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
 Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-bjack.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-bjack.git
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-bjack/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-bjack/trunk/
 
 Package: libbjack-ocaml
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
index d8c4fb5..781e562 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -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@, libjack-dev, libsamplerate0-dev, ocaml-findlib, pkg-config, dh-ocaml
+Build-Depends: @cdbs@, debhelper (>= 7), libjack-dev, libsamplerate0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
 Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-bjack/trunk
diff --git a/debian/libbjack-ocaml-dev.install.in b/debian/libbjack-ocaml-dev.install.in
index dce810b..2a92ae3 100644
--- a/debian/libbjack-ocaml-dev.install.in
+++ b/debian/libbjack-ocaml-dev.install.in
@@ -1,3 +1,3 @@
-usr/lib/ocaml/@OCamlABI@/bjack/META
-usr/lib/ocaml/@OCamlABI@/bjack/*.a
-usr/lib/ocaml/@OCamlABI@/bjack/*.cm*
+ at OCamlStdlibDir@/bjack/META
+ at OCamlStdlibDir@/bjack/*.a
+ at OCamlStdlibDir@/bjack/*.cm*
diff --git a/debian/rules b/debian/rules
index 166c104..3496783 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
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_INSTALL_ARGS :=  --list-missing
@@ -16,4 +16,3 @@ DEB_DH_INSTALL_ARGS :=  --list-missing
 build/libbjack-ocaml-dev::
 	mkdir -p $(DESTDIR)
 	make doc
-

-- 
ocaml-bjack packaging