[Pkg-ocaml-maint-commits] [SCM] ocaml-xmlplaylist packaging branch, master, updated. debian/0.1.1-2-2-g92a487b

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 92a487b23b92c5fdee50e03ebf81438e7b0ab77c
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Feb 26 23:52:06 2009 +0100

    Updated package.

diff --git a/debian/changelog b/debian/changelog
index c5bb2c8..d7e0a09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ocaml-xmlplaylist (0.1.1-3) UNRELEASED; 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 00:02:39 +0100
+ -- Samuel Mimram <smimram at debian.org>  Thu, 26 Feb 2009 23:49:21 +0100
 
 ocaml-xmlplaylist (0.1.1-2) 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 92c71f0..40ade74 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ 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 (>= 4.2.0), ocaml-nox (>= 3.11.0-1), ocaml-findlib (>= 1.2.3), libxml-light-ocaml-dev (>= 2.2-10), dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), ocaml-findlib (>= 1.2.4), libxml-light-ocaml-dev (>= 2.2-10), dh-ocaml
 Standards-Version: 3.8.0
+Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-xmlplaylist.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-xmlplaylist.git
 
 Package: libxmlplaylist-ocaml-dev
 Section: libdevel
 Architecture: any
-Homepage: http://savonet.sourceforge.net/
 Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libxml-light-ocaml-dev, ${misc:Depends}
 Description: Playlist parser for various xml formats
  This module implements basic playlist parsing
diff --git a/debian/control.in b/debian/control.in
index ab8e807..2266d4b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,15 +3,15 @@ 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@, ocaml-findlib, libxml-light-ocaml-dev, dh-ocaml
+Build-Depends: @cdbs@, debhelper (>= 7), ocaml-findlib (>= 1.2.4), libxml-light-ocaml-dev (>= 2.2-10), dh-ocaml
 Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-xmlplaylist/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xmlplaylist/trunk/
+Homepage: http://savonet.sourceforge.net/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-xmlplaylist.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-xmlplaylist.git
 
 Package: libxmlplaylist-ocaml-dev
 Section: libdevel
 Architecture: any
-Homepage: http://savonet.sourceforge.net/
 Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libxml-light-ocaml-dev, ${misc:Depends}
 Description: Playlist parser for various xml formats
  This module implements basic playlist parsing
diff --git a/debian/libxmlplaylist-ocaml-dev.install.in b/debian/libxmlplaylist-ocaml-dev.install.in
index f9088a0..870e683 100644
--- a/debian/libxmlplaylist-ocaml-dev.install.in
+++ b/debian/libxmlplaylist-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/xmlplaylist/META
-debian/tmp/usr/lib/ocaml/@OCamlABI@/xmlplaylist/*.cm*
-debian/tmp/usr/lib/ocaml/@OCamlABI@/xmlplaylist/*.ml*
-debian/tmp/usr/lib/ocaml/@OCamlABI@/xmlplaylist/*.a
+ at OCamlStdlibDir@/xmlplaylist/META
+ at OCamlStdlibDir@/xmlplaylist/*.cm*
+ at OCamlStdlibDir@/xmlplaylist/*.ml*
+ at OCamlStdlibDir@/xmlplaylist/*.a
diff --git a/debian/rules b/debian/rules
index 094a64d..c48b079 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/libxmlplaylist-ocaml-dev::

-- 
ocaml-xmlplaylist packaging