[Pkg-ocaml-maint-commits] [SCM] numerix packaging branch, master, updated. debian/0.22-4-7-g1889dd9

Tue Feb 24 16:42:25 UTC 2009

The following commit has been merged in the master branch:
commit 939343db428e04678d4409d9581d41ff6191f649
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Tue Feb 24 16:50:11 2009 +0100

    Use dh-ocaml + update.

diff --git a/debian/changelog b/debian/changelog
index 1e431bc..a9b5efb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,15 +7,20 @@ numerix (0.22-5) UNRELEASED; urgency=low
   * Changed doc-base section to Programming/OCaml
 
   [ Sylvain Le Gall ]
-  * Update my email adress
+  * Update my email address.
 
   [ Stephane Glondu ]
   * Remove Julien from Uploaders
 
   [ Samuel Mimram ]
-  * Switch packaging to git
-
- -- Samuel Mimram <smimram at debian.org>  Tue, 24 Feb 2009 16:41:20 +0100
+  * Switch packaging to git.
+  * Use dh-ocaml.
+  * Update standards version to 3.8.0.
+  * Update compat to 7.
+  * Add Homepage field.
+  * Version reference to LGPL in copyright.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 24 Feb 2009 17:01:46 +0100
 
 numerix (0.22-4) 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 384a0ed..95bbbfc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.org>, Mike Furr <mfurr at debian.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: ocaml-nox (>= 3.10), libgmp3-dev, debhelper (>> 4.0.0), dpatch, autotools-dev
+Build-Depends: dh-ocaml, ocaml-nox (>= 3.11), libgmp3-dev, debhelper (>= 7), dpatch, autotools-dev
 Build-Depends-Indep: texlive, texlive-latex-extra, gs-common
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
+Homepage: http://pauillac.inria.fr/~quercia/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/numerix.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/numerix.git
 
diff --git a/debian/copyright b/debian/copyright
index ee78e85..a2a9aad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Copyright: 2001,2002,2003,2005  Michel Quercia <michel.quercia at prepas.org>
 
 License: LGPL + exception below
 On Debian systems, the LGPL is available at
-/usr/share/common-licenses/LGPL
+/usr/share/common-licenses/LGPL-2
 
 From LICENCE:
 
diff --git a/debian/libnumerix-ocaml-dev.dirs.in b/debian/libnumerix-ocaml-dev.dirs.in
index 2148628..db88ef3 100644
--- a/debian/libnumerix-ocaml-dev.dirs.in
+++ b/debian/libnumerix-ocaml-dev.dirs.in
@@ -1,2 +1,2 @@
-usr/lib/ocaml/#OCamlABI#/numerix/
-usr/lib/ocaml/#OCamlABI#/METAS/
+ at OCamlStdlibDir@/numerix/
+ at OCamlStdlibDir@/METAS/
diff --git a/debian/libnumerix-ocaml-dev.install.in b/debian/libnumerix-ocaml-dev.install.in
index d4ff0d3..9c931b0 100644
--- a/debian/libnumerix-ocaml-dev.install.in
+++ b/debian/libnumerix-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/#OCamlABI#/METAS/*	usr/lib/ocaml/#OCamlABI#/METAS/
-usr/lib/numerix.*	usr/lib/ocaml/#OCamlABI#/numerix/
-usr/include/numerix.mli	usr/lib/ocaml/#OCamlABI#/numerix/
-usr/lib/libnumerix-*.a	usr/lib/ocaml/#OCamlABI#/numerix/
+ at OCamlStdlibDir@/METAS/*
+usr/lib/numerix.*       @OCamlStdlibDir@/numerix/
+usr/include/numerix.mli @OCamlStdlibDir@/numerix/
+usr/lib/libnumerix-*.a  @OCamlStdlibDir@/numerix/
diff --git a/debian/libnumerix-ocaml.dirs.in b/debian/libnumerix-ocaml.dirs.in
index 39a95ac..a8131b4 100644
--- a/debian/libnumerix-ocaml.dirs.in
+++ b/debian/libnumerix-ocaml.dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/#OCamlABI#/stublibs/
+ at OCamlDllDir@
diff --git a/debian/libnumerix-ocaml.install.in b/debian/libnumerix-ocaml.install.in
index 80c3702..8615a33 100644
--- a/debian/libnumerix-ocaml.install.in
+++ b/debian/libnumerix-ocaml.install.in
@@ -1 +1 @@
-usr/lib/dll* usr/lib/ocaml/#OCamlABI#/stublibs/
+usr/lib/dll* @OCamlDllDir@
diff --git a/debian/numerix-doc.links b/debian/numerix-doc.links
new file mode 100644
index 0000000..58685fb
--- /dev/null
+++ b/debian/numerix-doc.links
@@ -0,0 +1 @@
+usr/share/doc/numerix-doc/html usr/share/doc/libnumerix-ocaml-dev/html
diff --git a/debian/rules b/debian/rules
index 1ce7d4b..254c399 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,13 @@
 #export DH_VERBOSE=1
 export DH_ALWAYS_EXCLUDE=CVS:.svn
 
-OCAMLLIB = $(shell ocamlc -where)
-OCAMLABI = $(shell ocamlc -version)
-OCAMLDIR = $(CURDIR)/debian/tmp$(OCAMLLIB)
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/dpatch/dpatch.make
+
+OCAMLDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 DOCDIR   = $(CURDIR)/debian/numerix-doc
 
-PACKAGE = numerix
 # Don't forget to update debian/META if this version number changes.
 VERSION = 0.22
 
@@ -44,17 +45,10 @@ endif
 
 export CFLAGS
 
-include /usr/share/dpatch/dpatch.make
-
-ocamlabi:
-	for i in $(wildcard debian/*.in); do \
-		sed -e 's/#OCamlABI#/$(OCAMLABI)/g' < $$i > $${i%.in}; \
-	done
-
 config: config-stamp
-config-stamp: ocamlabi patch-stamp
+config-stamp: ocamlinit patch-stamp
 	dh_testdir
-	dh_clean -k
+	dh_prep
 
 	cp /usr/share/misc/config.guess /usr/share/misc/config.sub config
 
@@ -66,14 +60,17 @@ config-stamp: ocamlabi patch-stamp
 build: build-stamp
 build-stamp: config-stamp
 	dh_testdir
-	dh_clean -k
+	dh_prep
 
+	-mkdir -p kernel/n/o
+	-mkdir -p kernel/c/o
+	-mkdir -p kernel/caml/o
+	-mkdir -p kernel/ocaml/o
 	$(MAKE)
 
 	touch build-stamp
 
-clean: patch clean1 unpatch
-clean1:
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 
@@ -81,12 +78,14 @@ clean1:
 	[ ! -f doc/Makefile ] || $(MAKE) -C doc clean
 
 	rm -rf debian/doc/
-	dh_clean config.guess config.sub build-stamp config-stamp
+	rm -f doc/english/*.{dvi,pdf,ps,maf} doc/francais/*.{dvi,pdf,ps,maf}
+	rm -f kernel/c/makefile kernel/caml/makefile kernel/config.h kernel/n/makefile kernel/ocaml/makefile kernel/pascal/makefile
+	rm -f config.guess config.sub config.log config.status Makefile
+	rm -f build-stamp config-stamp
 
-install: build
+install: build-stamp
 	dh_testdir
 	dh_testroot
-#	dh_clean -k
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
@@ -94,27 +93,28 @@ install: build
 	mkdir -p $(OCAMLDIR)/METAS
 	cp -p debian/META $(OCAMLDIR)/METAS/META.numerix
 
-	dh_install -s --sourcedir=debian/tmp
+	dh_install --list-missing
 
 # Prune empty directories
 	find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty
 
 # have to actually build first, since ocamldoc is run on a derived file
-install-doc: build
-	dh_clean -k -i
+install-doc: build-stamp
+	dh_prep -i
 	dh_installdirs -i
 
 	$(MAKE) -C doc all
 
 	mkdir -p debian/doc/html
 	find exemples -type f -exec chmod a-x {} \;
-	ocamldoc -html -m A -keep-code -d debian/doc/html/ \
+	$(OCAML_OCAMLDOC) -html -m A -keep-code -d debian/doc/html/ \
 		kernel/ocaml/mli/numerix.mli
 
 
 binary-indep: install-doc
 	dh_testdir
 	dh_testroot
+	dh_link -i
 	dh_installdocs -i
 	dh_installexamples -i
 	dh_installchangelogs -i
@@ -129,6 +129,7 @@ binary-indep: install-doc
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+	dh_link -s
 	dh_installdocs -s
 	dh_installchangelogs -s
 #	dh_installman -plibnumerix-ocaml-dev debian/ocamlnumx.1
@@ -141,9 +142,9 @@ binary-arch: build install
 	dh_makeshlibs -s
 	dh_installdeb -s
 	dh_shlibdeps -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums -s
 	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: patch unpatch config build clean clean1 install binary-indep binary-arch binary
+.PHONY: patch unpatch config build clean install binary-indep binary-arch binary

-- 
numerix packaging

