[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.3.0-1-2-g790d087

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 790d087c440b9c1104980e7f24c54fa5ee262e56
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 10:06:51 2009 +0100

    Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index dec7f2c..f20a990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-sqlite3 (1.3.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 10:01:43 +0100
+
 ocaml-sqlite3 (1.3.0-1) experimental; urgency=low
 
   * New Upstream Version.
diff --git a/debian/control b/debian/control
index 189bf67..d208851 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, ocaml-nox (>= 3.11), camlp4, libsqlite3-dev (>= 3.3.9), ocaml-findlib, dh-ocaml (>= 0.2)
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, ocaml-nox (>= 3.11), camlp4 (>= 3.11), libsqlite3-dev (>= 3.3.9), ocaml-findlib (>= 1.2.4), dh-ocaml (>= 0.2)
 Standards-Version: 3.8.0
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git
diff --git a/debian/rules b/debian/rules
index f78202a..2932fbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
 
-DESTDIR := $(CURDIR)/debian/tmp/$(shell ocamlc -where)
+DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -36,7 +36,9 @@ build: ocamlinit patch build-stamp
 build-stamp: config.status
 	dh_testdir
 	$(MAKE) bytecode docs
-	if [ -e /usr/bin/ocamlopt ]; then $(MAKE) opt; fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) opt
+endif
 	touch $@
 
 clean: unpatch ocamlinit-clean
@@ -67,7 +69,7 @@ binary-arch: build install
 	dh_installchangelogs CHANGES
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --list-missing
 	dh_installman
 	dh_link
 	dh_strip

-- 
ocaml-sqlite3 packaging