[Pkg-ocaml-maint-commits] [SCM] ocaml-soundtouch packaging branch, master, updated. debian/0.1.4-1-2-ge1eba51

[Samuel Mimram]

The following commit has been merged in the master branch:
commit e1eba511f9c4ac9cbcf3fc2d0b9bb3c35792ba5a
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Fri Feb 27 09:02:16 2009 +0100

    Rebuild with OCaml 3.11.

diff --git a/debian/changelog b/debian/changelog
index 43be755..e169779 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ocaml-soundtouch (0.1.4-2) UNRELEASED; urgency=low
+ocaml-soundtouch (0.1.4-2) unstable; urgency=low
 
-  * Switch packaging to git
+  * Rebuild with OCaml 3.11.
+  * Switch packaging to git.
+  * Update compat to 7.
+  * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 14:45:49 +0100
+ -- Samuel Mimram <smimram at debian.org>  Fri, 27 Feb 2009 09:00:20 +0100
 
 ocaml-soundtouch (0.1.4-1) unstable; 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 0905731..67f6505 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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, libsoundtouch1-dev, ocaml-findlib, pkg-config
-Standards-Version: 3.7.3
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libsoundtouch1-dev, ocaml-findlib (>= 1.2.4), pkg-config
+Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-soundtouch.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-soundtouch.git
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-soundtouch.
 Package: libsoundtouch-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for the sound stretching library
  Libsoundtouch is a library that can be used to change pitch and time
  of soundfiles independently. This package provides OCaml interface to
@@ -23,7 +23,7 @@ Description: OCaml bindings for the sound stretching library
 Package: libsoundtouch-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libsoundtouch1-dev, libsoundtouch-ocaml (= ${binary:Version}), ocaml-findlib
+Depends: ocaml-nox-${F:OCamlABI}, libsoundtouch1-dev, libsoundtouch-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
 Description: OCaml bindings for the sound stretching library
  Libsoundtouch is a library that can be used to change pitch and time
  of soundfiles independently. This package provides OCaml interface to
diff --git a/debian/control.in b/debian/control.in
index 9bace50..0f52362 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,16 +3,16 @@ 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@, libsoundtouch1-dev, ocaml-findlib, pkg-config
-Standards-Version: 3.7.3
+Build-Depends: @cdbs@, debhelper (>= 7), libsoundtouch1-dev, ocaml-findlib (>= 1.2.4), pkg-config
+Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-soundtouch/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-soundtouch/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-soundtouch.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-soundtouch.git
 
 Package: libsoundtouch-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for the sound stretching library
  Libsoundtouch is a library that can be used to change pitch and time
  of soundfiles independently. This package provides OCaml interface to
@@ -23,7 +23,7 @@ Description: OCaml bindings for the sound stretching library
 Package: libsoundtouch-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libsoundtouch1-dev, libsoundtouch-ocaml (= ${binary:Version}), ocaml-findlib
+Depends: ocaml-nox-${F:OCamlABI}, libsoundtouch1-dev, libsoundtouch-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
 Description: OCaml bindings for the sound stretching library
  Libsoundtouch is a library that can be used to change pitch and time
  of soundfiles independently. This package provides OCaml interface to
diff --git a/debian/libsoundtouch-ocaml-dev.install.in b/debian/libsoundtouch-ocaml-dev.install.in
index 3fcd117..7c6e538 100644
--- a/debian/libsoundtouch-ocaml-dev.install.in
+++ b/debian/libsoundtouch-ocaml-dev.install.in
@@ -1,3 +1,3 @@
-usr/lib/ocaml/@OCamlABI@/soundtouch/META
-usr/lib/ocaml/@OCamlABI@/soundtouch/*.a
-usr/lib/ocaml/@OCamlABI@/soundtouch/*.cm*
+ at OCamlStdlibDir@/soundtouch/META
+ at OCamlStdlibDir@/soundtouch/*.a
+ at OCamlStdlibDir@/soundtouch/*.cm*
diff --git a/debian/libsoundtouch-ocaml.install.in b/debian/libsoundtouch-ocaml.install.in
index 66d8620..1f764b4 100644
--- a/debian/libsoundtouch-ocaml.install.in
+++ b/debian/libsoundtouch-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/soundtouch/dllsoundtouch_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/soundtouch/dllsoundtouch_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index ef7f6c6..271ac01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,15 @@
 
 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
 
 build/libsoundtouch-ocaml-dev::
 	mkdir -p $(DESTDIR)
-

-- 
ocaml-soundtouch packaging