[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/20070908-1-16-g821b142

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 821b142dd4315209b803c425d98c671cda685962
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Mon Mar 2 21:09:59 2009 +0100

    Build with OCaml 3.11.

diff --git a/debian/changelog b/debian/changelog
index 98fa5dc..729887f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,18 @@
-cairo-ocaml (20090223-1) UNRELEASED; urgency=low
+cairo-ocaml (20090223-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
   [ Samuel Mimram ]
   * New CVS snapshot.
+  * Build with OCaml 3.11.
   * Remove fun_names.dpatch, integrated upstream.
   * Switch packaging to git
   * Use dh-ocaml.
   * Update compat to 7.
   * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 18:17:11 +0100
+ -- Samuel Mimram <smimram at debian.org>  Mon, 02 Mar 2009 21:08:17 +0100
 
 cairo-ocaml (20070908-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a1b5142..11be4a7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cairo-ocaml
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, automake1.9, autoconf, ocaml-findlib, dh-ocaml, ocaml-nox (>= 3.11), libcairo2-dev (>= 1.2), liblablgtk2-ocaml-dev
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, automake1.9, autoconf, ocaml-findlib (>= 1.2.4), dh-ocaml, ocaml-nox (>= 3.11), libcairo2-dev (>= 1.2), liblablgtk2-ocaml-dev (>= 2.12.0)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cairo-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cairo-ocaml.git
diff --git a/debian/dirs.in b/debian/dirs.in
index fd4ffc2..9202272 100644
--- a/debian/dirs.in
+++ b/debian/dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/cairo
+ at OCamlStdlibDir@/cairo
diff --git a/debian/libcairo-ocaml.install.in b/debian/libcairo-ocaml.install.in
index c2e4c0d..71e69f3 100644
--- a/debian/libcairo-ocaml.install.in
+++ b/debian/libcairo-ocaml.install.in
@@ -1,2 +1 @@
- at OCamlStdlibDir@/cairo/dllmlcairo.so         @OCamlDllDir@
- at OCamlStdlibDir@/cairo/dllmlcairo_lablgtk.so @OCamlDllDir@
+ at OCamlStdlibDir@/cairo/*.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 68727a4..725d401 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
-# We want to use dpatch
 include /usr/share/dpatch/dpatch.make
 
 DESTDIR = $(CURDIR)/debian/tmp
@@ -49,6 +48,8 @@ clean: unpatch ocamlinit-clean
 	rm -f build-stamp
 
 	[ ! -f config.make ] || $(MAKE) clean
+	$(RM) -f aclocal.m4 config.{log,make,status} configure
+	$(RM) -rf doc
 
 	dh_clean
 
@@ -63,11 +64,8 @@ install: build
 	mkdir -p debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
 	cp debian/META debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot

-- 
cairo-ocaml packaging