[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-1-13-gec6e568

[Samuel Mimram]

The following commit has been merged in the master branch:
commit ec6e568d1e0386d676e0a6f22a6d7ecead9519e9
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 10:33:22 2009 +0100

    Upload to unstable + use dh-ocaml.

diff --git a/debian/changelog b/debian/changelog
index b5d0566..07d57e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-lablgl (1.04-2) UNRELEASED; urgency=low
+lablgl (1.04-2) unstable; urgency=low
 
+  [ Stephane Glondu ]
   * Switch packaging to git
   * Add myself to Uploaders
   * Remove Julien from uploaders
@@ -9,7 +10,11 @@ lablgl (1.04-2) UNRELEASED; urgency=low
   * Remove versioned dependencies available in stable
   * Add debian/clean
 
- -- Stephane Glondu <steph at glondu.net>  Mon, 16 Feb 2009 09:01:12 +0100
+  [ Samuel Mimram ]
+  * Upload to unstable and build with OCaml 3.11.
+  * Use dh-ocaml predefined variables.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 10:27:41 +0100
 
 lablgl (1.04-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 92295bc..a31a978 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
  Ralf Treinen <treinen at debian.org>
 Build-Depends:
  debhelper (>= 7.0),
- ocaml,
+ ocaml (>= 3.11),
  tcl8.4-dev,
  tk8.4-dev,
  libgl1-mesa-dev | libgl-dev,
@@ -24,7 +24,7 @@ Build-Depends:
  docbook-xsl,
  libxml2-utils,
  xsltproc,
- camlp4,
+ camlp4 (>= 3.11),
  dh-ocaml
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgl.git
diff --git a/debian/rules b/debian/rules
index 97ee8fd..40eb59b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,27 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
+# Sample debian/rules that uses debhelper.
 # GNU copyright 1997 by Joey Hess.
-#
 
-PACKAGE = lablgl
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 
-OCAML_ABI := $(shell ocamlc -version)
-OCAML_STDLIB_DIR := $(shell ocamlc -where)
-OCAML_DLL_DIR := $(OCAML_STDLIB_DIR)/stublibs
-
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export OCAML_LIBDIR=$(shell ocamlc -where)
-
-OCAML_IN_FILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-OCAMLINIT_SED := -e 's%^ \+%%' \
-  -e 's%@OCamlABI@%$(OCAML_ABI)%' \
-  -e 's%@OCamlStdlibDir@%$(OCAML_STDLIB_DIR)%' \
-  -e 's%@OCamlDllDir@%$(OCAML_DLL_DIR)%'
-ifeq (,$(OCAML_OPT_ARCH))
-  OCAMLINIT_SED += -e '/^OPT: /d'
-else
-  OCAMLINIT_SED += -e 's/^OPT: //'
-endif
-
 configure: configure-stamp
 configure-stamp:
-	for t in $(OCAML_IN_FILES); do \
-	  sed $(OCAMLINIT_SED) $$t.in > $$t; \
-	done
-
 	dh_testdir
-	# Add here commands to configure the package.
 	cp debian/Makefile.config .
-
 	touch configure-stamp
 
-build: build-stamp
+build: ocamlinit build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE)
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) opt; \
-	fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) opt
+endif
 
 	# Quick replacement for docbook/po4a CDBS class
 	# TODO: use cdbs + po4a
@@ -56,7 +32,7 @@ build-stamp: configure-stamp
 
 	touch build-stamp
 
-clean:
+clean: ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -80,20 +56,20 @@ install: build
 	# Add here commands to install the package into
 	# debian/liblablgl-ocaml-dev
 	$(MAKE) install									\
-		LIBDIR=$(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_LIBDIR)		\
-		DLLDIR=$(CURDIR)/debian/liblablgl-ocaml$(OCAML_LIBDIR)/stublibs	\
+		LIBDIR=$(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_STDLIB_DIR)		\
+		DLLDIR=$(CURDIR)/debian/liblablgl-ocaml$(OCAML_STDLIB_DIR)/stublibs	\
 		BINDIR=$(CURDIR)/debian/liblablgl-ocaml-dev/usr/bin
 
-	cp debian/META $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_LIBDIR)/lablgl
-	ln -sf $(OCAML_LIBDIR)/lablgl $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_LIBDIR)/lablGL
+	cp debian/META $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_STDLIB_DIR)/lablgl
+	ln -sf $(OCAML_STDLIB_DIR)/lablgl $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_STDLIB_DIR)/lablGL
 
 	# Doc generation (TODO: use CDBS)
 	for i in liblablgl-ocaml-dev; do \
 	  mkdir -p debian/$$i/usr/share/doc/$$i/html/api; \
-	  OCAMLDOC_INCLUDE=`find debian/$$i/$(OCAML_LIBDIR)/ -type d -exec echo -I \{} \;`; \
-	  find debian/$$i/$(OCAML_LIBDIR)/ \
+	  OCAMLDOC_INCLUDE=`find debian/$$i/$(OCAML_STDLIB_DIR)/ -type d -exec echo -I \{} \;`; \
+	  find debian/$$i/$(OCAML_STDLIB_DIR)/ \
 	    -type f -name '*.mli' -or -name '*.ml' \
-	    | xargs ocamldoc -I $(OCAML_LIBDIR)/labltk \
+	    | xargs $(OCAML_OCAMLDOC) -I $(OCAML_STDLIB_DIR)/labltk \
 	     -stars -m A -no-custom-tags $$OCAMLDOC_INCLUDE -html \
 	     -d debian/$$i/usr/share/doc/$$i/html/api \
             || true; \
@@ -115,7 +91,7 @@ binary-arch: build install
 	dh_installexamples -s
 	dh_installmenu -s
 	dh_installcron -s
-	dh_installman -s 
+	dh_installman -s
 	dh_installinfo -s
 	dh_installchangelogs CHANGES -s
 	dh_strip -s

-- 
lablgl packaging