[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 03f0354da9aa6a5aef7e8740c95d84eaf16064b9
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Wed Oct 7 12:08:42 2009 +0200

    Use ocamlinit.mk (Closes: #521429)

diff --git a/debian/changelog b/debian/changelog
index 8541c5c..a6ea5a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ocamlbricks (0.50.1-4) unstable; urgency=low
   * Downgrade build-depends from ocaml to ocaml-nox
   * Upgrade Standards-Version to 3.8.3 (section ocaml)
   * Add debian/README.source
+  * Use ocamlinit.mk (Closes: #521429)
 
  -- Sylvain Le Gall <gildor at debian.org>  Wed, 07 Oct 2009 09:03:49 +0000
 
diff --git a/debian/rules b/debian/rules
index 6de9832..db79ac9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,11 @@
 # This file was generated by dh_make and adapted by 
 # Jonathan Roudiere (2008) for liboamlbricks-ocaml-dev package.
 
+# include standard OCaml template
+include /usr/share/ocaml/ocamlinit.mk
+
 # Variable use here (find version, path)
-OCAMLABI := $(shell ocamlc -version)
-OCAML_LIBDIR := $(shell ocamlc -where)
-OCAML_LIBDIR2 := $(subst /,\/,$(OCAML_LIBDIR))
 DESTDIR = $(CURDIR)/debian/tmp
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
 
 # include an external Makefile to use dpatch
 include /usr/share/dpatch/dpatch.make
@@ -26,9 +25,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
         INSTALL_PROGRAM += -s
 endif
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlStdlibDir@/$(OCAML_LIBDIR2)/g' $$f.in > $$f; done
-
 configure: configure-stamp
 configure-stamp: ocamlinit
 	dh_testdir
@@ -41,7 +37,7 @@ build-stamp: patch-stamp configure-stamp
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	-$(RM) build-stamp configure-stamp 
@@ -64,12 +60,12 @@ install: build
 	cp $(DESTDIR)/usr/share/doc/$(PACKAGE)/html/*.css $(CURDIR)/debian/$(DEB_PACKAGE)/usr/share/doc/$(DEB_PACKAGE)/html/api/
 
 	# Copy libraries for libocamlbricks-ocaml-dev
-	cp $(DESTDIR)/$(OCAML_LIBDIR)/$(PACKAGE)/* $(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_LIBDIR)/$(PACKAGE)/
-	-$(RM) $(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_LIBDIR)/$(PACKAGE)/stupidprogram*
+	cp $(DESTDIR)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/* $(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/
+	-$(RM) $(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/stupidprogram*
 
 	# create .mli file (header)
 	chmod +x $(CURDIR)/debian/generate_mli.sh
-	$(CURDIR)/debian/generate_mli.sh  $(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_LIBDIR)/$(PACKAGE)/
+	$(CURDIR)/debian/generate_mli.sh  $(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -91,7 +87,7 @@ binary-arch: build install
 	dh_installdeb -s
 	dh_shlibdeps -s
 	dh_ocaml -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s
 

-- 
ocamlbricks packaging