[Pkg-ocaml-maint-commits] [SCM] mysql-ocaml packaging branch, master, updated. debian/1.0.4-5-1-gc97c3e0

[Samuel Mimram]

The following commit has been merged in the master branch:
commit c97c3e0386cadd08c4065cf28149a972d1dae5ce
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 11:03:01 2009 +0100

    Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index a6caec1..6730cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mysql-ocaml (1.0.4-6) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 11:01:33 +0100
+
 mysql-ocaml (1.0.4-5) experimental; urgency=low
 
   [ Stefano Zacchiroli ]
diff --git a/debian/control b/debian/control
index 9a42427..3db2910 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mysql-ocaml
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7), libmysqlclient15-dev, dh-ocaml (>= 0.2), ocaml-nox (>= 3.11), camlp4, ocaml-findlib, dpatch
+Build-Depends: debhelper (>= 7), libmysqlclient15-dev, dh-ocaml (>= 0.2), ocaml-nox (>= 3.11), camlp4 (>= 3.11), ocaml-findlib (>= 1.2.4), dpatch
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mysql-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mysql-ocaml.git
diff --git a/debian/rules b/debian/rules
index 6e30f18..4c94c70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,9 @@ build-stamp: config.status
 	dh_testdir
 
 	$(MAKE)
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) opt
+endif
 
 	touch build-stamp
 

-- 
mysql-ocaml packaging