[Pkg-ocaml-maint-commits] [SCM] ocamlodbc packaging branch, master, updated. debian/2.15-3-3-g15018fb

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 15018fb1b25051fb5a7505b81fadb44d7c5c8a95
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Mar 5 10:08:33 2009 +0100

    Rebuild with OCaml 3.11.

diff --git a/debian/changelog b/debian/changelog
index 937d964..185619c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-ocamlodbc (2.15-4) UNRELEASED; urgency=low
+ocamlodbc (2.15-4) unstable; urgency=low
 
-  [ Stefano Zacchiroli ]
-  * NOT RELEASED YET
-
-  [ Samuel Mimram ]
-  * Switch packaging to git
+  * Rebuild with OCaml 3.11.
+  * Use dh-ocaml.
+  * Switch packaging to git.
+  * Update compat to 7.
+  * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Tue, 24 Feb 2009 19:22:20 +0100
+ -- Samuel Mimram <smimram at debian.org>  Thu, 05 Mar 2009 10:07:42 +0100
 
 ocamlodbc (2.15-3) unstable; urgency=medium
 
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 21aa45f..67d8c97 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml-nox (>= 3.10), ocaml-findlib (>= 1.0.3-1), liblablgtk2-ocaml-dev, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7), unixodbc-dev, unixodbc-bin, dh-ocaml, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), liblablgtk2-ocaml-dev (>= 2.12.0), dpatch
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlodbc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlodbc.git
 
diff --git a/debian/libocamlodbc-ocaml-dev.doc-base b/debian/libocamlodbc-ocaml-dev.doc-base
index dd45df4..d743a9b 100644
--- a/debian/libocamlodbc-ocaml-dev.doc-base
+++ b/debian/libocamlodbc-ocaml-dev.doc-base
@@ -3,7 +3,7 @@ Title: OCamlODBC API Manual
 Author: Maxence Guesdon <Maxence.Guesdon at inria.fr>
 Abstract: Descriptions of the API for OcamlODBC, an ODBC database
  library for the OCaml language.
-Section: devel
+Section: Programming/OCaml
 
 Format: HTML
 Index: /usr/share/doc/libocamlodbc-ocaml-dev/html/index.html
diff --git a/debian/rules b/debian/rules
index 9d0962a..e7a4d46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,13 +6,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# We want to use dpatch
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 include /usr/share/dpatch/dpatch.make
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-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)
@@ -30,15 +28,12 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 config.status: configure
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 build: patch-stamp build-stamp
-build-stamp:  config.status
+build-stamp: config.status
 	dh_testdir
 
 	$(MAKE) depend
@@ -48,7 +43,7 @@ build-stamp:  config.status
 
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -62,7 +57,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
@@ -81,7 +76,7 @@ binary-arch: build install
 	dh_installdocs
 	dh_installexamples
 	rm -f debian/libocamlodbc-ocaml-dev/usr/share/doc/libocamlodbc-ocaml-dev/examples/Biniki/.cvsignore
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --list-missing
 	dh_installman
 	dh_link
 	dh_strip
@@ -90,7 +85,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
 

-- 
ocamlodbc packaging