The following commit has been merged in the master branch:
commit b1e6d24a80a649502cb0aa7d6cf27eff29d88341
Author: Samuel Mimram <[email protected]>
Date: Wed Feb 18 20:43:58 2009 +0100
Use predefined variables in rules.
diff --git a/debian/changelog b/debian/changelog
index 3257ec1..c8f03f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,12 @@ ocaml-sqlite3 (1.3.0-1) UNRELEASED; urgency=low
* New Upstream Version.
* Switch packaging to git.
+ * Build-depend on dh-ocaml and use predefined variables and ocamlinit in
+ rules.
* Update compat to 7.
* Update standards version to 3.8.0.
- -- Samuel Mimram <[email protected]> Wed, 18 Feb 2009 20:31:55 +0100
+ -- Samuel Mimram <[email protected]> Wed, 18 Feb 2009 20:42:47 +0100
ocaml-sqlite3 (1.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 58b3802..c6dd166 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian OCaml Maintainers <[email protected]>
Uploaders: Samuel Mimram <[email protected]>, Stephane Glondu
<[email protected]>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, ocaml-nox (>=
3.10.0), camlp4, libsqlite3-dev (>= 3.3.9), ocaml-findlib
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, ocaml-nox (>=
3.10.0), camlp4, libsqlite3-dev (>= 3.3.9), ocaml-findlib, 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/libsqlite3-ocaml-dev.install.in
b/debian/libsqlite3-ocaml-dev.install.in
index 1934dc1..b303c51 100644
--- a/debian/libsqlite3-ocaml-dev.install.in
+++ b/debian/libsqlite3-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/sqlite3/META
-usr/lib/ocaml/@OCamlABI@/sqlite3/*.a
-usr/lib/ocaml/@OCamlABI@/sqlite3/*.cm*
-usr/lib/ocaml/@OCamlABI@/sqlite3/*.ml*
+...@ocamlstdlibdir@/sqlite3/META
+...@ocamlstdlibdir@/sqlite3/*.a
+...@ocamlstdlibdir@/sqlite3/*.cm*
+...@ocamlstdlibdir@/sqlite3/*.ml*
diff --git a/debian/libsqlite3-ocaml.install.in
b/debian/libsqlite3-ocaml.install.in
index 79d1ec0..8333acb 100644
--- a/debian/libsqlite3-ocaml.install.in
+++ b/debian/libsqlite3-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/sqlite3/dllsqlite3_stubs.so
usr/lib/ocaml/@OCamlABI@/stublibs/
+...@ocamlstdlibdir@/sqlite3/dllsqlite3_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 30739f5..2788502 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,8 @@
#export DH_VERBOSE=1
include /usr/share/dpatch/dpatch.make
-
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
DESTDIR := $(CURDIR)/debian/tmp/$(shell ocamlc -where)
@@ -29,11 +28,6 @@ else
CFLAGS += -O2
endif
-
-ocamlinit:
- for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in >
$$f; done
-
-
config.status: configure
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
@@ -81,7 +75,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
dh_md5sums
dh_builddeb
--
ocaml-sqlite3 packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
