[Pkg-ocaml-maint-commits] [SCM] pycaml packaging branch, master, updated. debian/0.82-8-4-g31e73f1

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 31e73f1d3a83ba5c3fcea1a4831857d7b363fa2a
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Mar 5 18:12:44 2009 +0100

    Rebuild with OCaml 3.11.

diff --git a/debian/changelog b/debian/changelog
index 21d1f5f..d3bb1d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,18 @@
-pycaml (0.82-9) UNRELEASED; urgency=low
-
-  [ Sylvain Le Gall ]
-  * NOT RELEASED YET
+pycaml (0.82-9) unstable; urgency=low
 
   [ Stephane Glondu ]
   * Fix dependencies and location of dllpycaml_stubs.so (thanks to
     Michael Bienia).
 
   [ Samuel Mimram ]
-  * Switch packaging to git
-
- -- Samuel Mimram <smimram at debian.org>  Thu, 05 Mar 2009 18:08:12 +0100
+  * Rebuild with OCaml 3.11.
+  * Switch packaging to git.
+  * Use dh-ocaml.
+  * Update compat to 7.
+  * Update standards version to 3.8.0.
+  * Remove useless lintian override.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 05 Mar 2009 18:26:01 +0100
 
 pycaml (0.82-8) 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 0af1233..ba51504 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libdevel
 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 (>= 5.0.37.2), python-support (>= 0.3), ocaml-nox (>= 3.10), python-dev (>= 2.3), ocamlmakefile, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7), python-support (>= 0.3), dh-ocaml, ocaml-nox (>= 3.11), python-dev (>= 2.3), ocamlmakefile, dpatch
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pycaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pycaml.git
 
diff --git a/debian/dirs b/debian/dirs
index a49457a..e772481 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1 @@
 usr/bin
-usr/share/lintian/overrides
diff --git a/debian/override.in b/debian/override.in
deleted file mode 100644
index b9c7c87..0000000
--- a/debian/override.in
+++ /dev/null
@@ -1 +0,0 @@
-binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/dllpycaml_stubs.so /usr/lib/python2.3/config
diff --git a/debian/rules b/debian/rules
index c972e2c..91f90e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Include dpatch stuff.
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 include /usr/share/dpatch/dpatch.make
 
 # These are used for cross-compiling and for saving the configure script
@@ -14,10 +15,7 @@ include /usr/share/dpatch/dpatch.make
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-DESTDIR = $(CURDIR)/debian/pycaml/$(shell ocamlc -where)
+DESTDIR = $(CURDIR)/debian/pycaml/$(OCAML_STDLIB_DIR)
 
 CFLAGS = -Wall -g
 
@@ -30,9 +28,6 @@ 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
 
@@ -43,12 +38,16 @@ build-stamp: config.status patch-stamp
 	dh_testdir
 
 	cp debian/Makefile .
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) allopt; else $(MAKE) all; fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) allopt
+else
+	$(MAKE) all
+endif
 	#$(MAKE) opt
 
 	touch build-stamp
 
-clean: clean1 unpatch
+clean: clean1 unpatch ocamlinit-clean
 clean1:
 	dh_testdir
 	dh_testroot
@@ -70,7 +69,7 @@ clean1:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
@@ -81,7 +80,6 @@ install: build
 	make rawinstall OCAML_LIB_INSTALL=$(DESTDIR)
 	mv $(DESTDIR)/dllpycaml_stubs.so $(DESTDIR)/stublibs
 	cp pycaml.customtop debian/pycaml/usr/bin/pycamltop
-	install -m 644 debian/override debian/pycaml/usr/share/lintian/overrides/pycaml
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -106,7 +104,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
 

-- 
pycaml packaging