[Pkg-ocaml-maint-commits] [SCM] ocaml-taglib packaging branch, master, updated. debian/0.1.2-2-2-ga949fe0

[Samuel Mimram]

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

    Rebuild with OCaml 3.11.

diff --git a/debian/changelog b/debian/changelog
index de0d2df..b03afac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ocaml-taglib (0.1.2-3) UNRELEASED; urgency=low
+ocaml-taglib (0.1.2-3) 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>  Fri, 27 Feb 2009 09:21:30 +0100
+ -- Samuel Mimram <smimram at debian.org>  Fri, 27 Feb 2009 09:31:31 +0100
 
 ocaml-taglib (0.1.2-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 662be74..96cf4ea 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 (>= 5), ocaml-nox (>= 3.11.0-1), libtagc0-dev, ocaml-findlib (>= 1.2.3), pkg-config, dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libtagc0-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-taglib.git
@@ -15,7 +15,7 @@ Section: libs
 Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for the TagLib Audio Meta-Data Library
  TagLib is a library for reading and editing the meta-data of several popular
- audio formats. This package provides ocaml interface to
+ audio formats. This package provides OCaml interface to
  the C library.
  .
  This package contains only the shared runtime stub libraries.
@@ -26,7 +26,7 @@ Section: libdevel
 Depends: ocaml-nox-${F:OCamlABI}, libtagc0-dev, libtaglib-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
 Description: OCaml bindings for the TagLib Audio Meta-Data Library
  TagLib is a library for reading and editing the meta-data of several popular
- audio formats. This package provides ocaml interface to
+ audio formats. This package provides OCaml interface to
  the C library.
  .
  This package contains all the development stuff you need to develop
diff --git a/debian/control.in b/debian/control.in
index 19fb5e8..02c527e 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: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
-Build-Depends: @cdbs@, libtagc0-dev, ocaml-findlib, pkg-config, dh-ocaml
+Build-Depends: @cdbs@, debhelper (>= 7), libtagc0-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-taglib/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-taglib.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-taglib.git
 
 Package: libtaglib-ocaml
 Architecture: any
@@ -15,7 +15,7 @@ Section: libs
 Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for the TagLib Audio Meta-Data Library
  TagLib is a library for reading and editing the meta-data of several popular
- audio formats. This package provides ocaml interface to
+ audio formats. This package provides OCaml interface to
  the C library.
  .
  This package contains only the shared runtime stub libraries.
@@ -26,7 +26,7 @@ Section: libdevel
 Depends: ocaml-nox-${F:OCamlABI}, libtagc0-dev, libtaglib-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
 Description: OCaml bindings for the TagLib Audio Meta-Data Library
  TagLib is a library for reading and editing the meta-data of several popular
- audio formats. This package provides ocaml interface to
+ audio formats. This package provides OCaml interface to
  the C library.
  .
  This package contains all the development stuff you need to develop
diff --git a/debian/libtaglib-ocaml-dev.install.in b/debian/libtaglib-ocaml-dev.install.in
index b777f7d..17082ce 100644
--- a/debian/libtaglib-ocaml-dev.install.in
+++ b/debian/libtaglib-ocaml-dev.install.in
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/META
-debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/*.a
-debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/*.cm*
+ at OCamlStdlibDir@/taglib/META
+ at OCamlStdlibDir@/taglib/*.a
+ at OCamlStdlibDir@/taglib/*.cm*
diff --git a/debian/libtaglib-ocaml.install.in b/debian/libtaglib-ocaml.install.in
index 6e45b68..a74f43e 100644
--- a/debian/libtaglib-ocaml.install.in
+++ b/debian/libtaglib-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/dlltaglib_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/taglib/dlltaglib_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 3906f26..09c2ce2 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/libtaglib-ocaml-dev::

-- 
ocaml-taglib packaging