[Pkg-ocaml-maint-commits] [SCM] pagodacf packaging branch, master, updated. debian/0.10-1-2-gae9286a

[Samuel Mimram]

The following commit has been merged in the master branch:
commit ae9286a3d669814871c9bb26437107df87e1b221
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Sun Mar 1 21:04:22 2009 +0100

    Update package.

diff --git a/debian/changelog b/debian/changelog
index 351ee8d..4ae9059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-pagodacf (0.10-2) UNRELEASED; urgency=low
+pagodacf (0.10-2) unstable; urgency=low
 
-  * Switch packaging to git
+  * Rebuild with OCaml 3.11.
+  * Switch packaging to git.
+  * Use dh-ocaml.
+  * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Fri, 20 Feb 2009 10:46:35 +0100
+ -- Samuel Mimram <smimram at debian.org>  Sun, 01 Mar 2009 21:00:31 +0100
 
 pagodacf (0.10-1) unstable; urgency=low
 
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 3c4edbf..06b2982 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.10), ocaml-findlib, dpatch
+Build-Depends: debhelper (>= 7), dh-ocaml, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), dpatch
 Standards-Version: 3.8.0
 Homepage: http://www.sourceforge.net/projects/ocnae/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pagodacf.git
diff --git a/debian/libcf-ocaml-dev.dirs.in b/debian/libcf-ocaml-dev.dirs.in
index c9b5b5e..bd8a85d 100644
--- a/debian/libcf-ocaml-dev.dirs.in
+++ b/debian/libcf-ocaml-dev.dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/cf
+ at OCamlStdlibDir@/cf
diff --git a/debian/libcf-ocaml-dev.doc-base b/debian/libcf-ocaml-dev.doc-base
index c1b67f5..3feceb0 100644
--- a/debian/libcf-ocaml-dev.doc-base
+++ b/debian/libcf-ocaml-dev.doc-base
@@ -2,7 +2,7 @@ Document: pagodacf
 Title: OCaml library with miscellaneous utility functions
 Author: James Woodyatt
 Abstract: The pagoda core foundation is an OCaml library which provides various modules from parsers to time manipulation.
-Section: devel
+Section: Programming/OCaml
 
 Format: HTML
 Index: /usr/share/doc/libcf-ocaml-dev/html/index.html
diff --git a/debian/libcf-ocaml-dev.install.in b/debian/libcf-ocaml-dev.install.in
index 0584ed2..8c1aa69 100644
--- a/debian/libcf-ocaml-dev.install.in
+++ b/debian/libcf-ocaml-dev.install.in
@@ -1,5 +1,5 @@
-usr/lib/ocaml/@OCamlABI@/cf/META
-usr/lib/ocaml/@OCamlABI@/cf/*.a
-usr/lib/ocaml/@OCamlABI@/cf/*.cm*
-usr/lib/ocaml/@OCamlABI@/cf/*.ml*
-usr/lib/ocaml/@OCamlABI@/cf/*.h
+ at OCamlStdlibDir@/cf/META
+ at OCamlStdlibDir@/cf/*.a
+ at OCamlStdlibDir@/cf/*.cm*
+ at OCamlStdlibDir@/cf/*.ml*
+ at OCamlStdlibDir@/cf/*.h
diff --git a/debian/libcf-ocaml.dirs.in b/debian/libcf-ocaml.dirs.in
index b9e0896..a8131b4 100644
--- a/debian/libcf-ocaml.dirs.in
+++ b/debian/libcf-ocaml.dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/stublibs
+ at OCamlDllDir@
diff --git a/debian/libcf-ocaml.install.in b/debian/libcf-ocaml.install.in
index 25b7e22..efe27b3 100644
--- a/debian/libcf-ocaml.install.in
+++ b/debian/libcf-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/cf/dllcf.so  usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/cf/dllcf.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 0924495..e58d2fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-# We want to use dpatch.
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 include /usr/share/dpatch/dpatch.make
 
 TMPDIR=debian/tmp
-DESTDIR=$(TMPDIR)/$(shell ocamlc -where)
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+DESTDIR=$(TMPDIR)/$(OCAML_STDLIB_DIR)
 
 build: ocamlinit patch-stamp build-stamp
 build-stamp:
@@ -24,13 +19,15 @@ build-stamp:
 
 	$(MAKE) depend
 	$(MAKE) DEBUG_OPT="-g" default
-	if [ -e /usr/bin/ocamlopt ]; then $(MAKE) opt; fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) opt
+endif
 	$(MAKE) doc
 	mv doc html
 
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -44,24 +41,21 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
 	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
-# 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
 	dh_installchangelogs CHANGES
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --list-missing
 	dh_installman
 	dh_link
 	dh_strip
@@ -70,7 +64,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
 

-- 
pagodacf packaging