[Pkg-ocaml-maint-commits] r3156 - in /trunk/packages/findlib/trunk/debian: changelog control rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep 17 11:25:12 2006
New Revision: 3156

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3156
Log:
use ocaml.mk, ready for 3.09.3

Modified:
    trunk/packages/findlib/trunk/debian/changelog
    trunk/packages/findlib/trunk/debian/control
    trunk/packages/findlib/trunk/debian/rules

Modified: trunk/packages/findlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/changelog?rev=3156&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/changelog (original)
+++ trunk/packages/findlib/trunk/debian/changelog Sun Sep 17 11:25:12 2006
@@ -1,3 +1,12 @@
+findlib (1.1.1-7) UNRELEASED; urgency=low
+
+  * debian/rules
+    - use the ocaml.mk cdbs class
+  * debian/control
+    - bumped ocaml-nox build dependency to >= 3.09.3 since we use ocaml.mk
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Sep 2006 13:14:00 +0200
+
 findlib (1.1.1-6) unstable; urgency=low
 
   * debian/rules

Modified: trunk/packages/findlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/control?rev=3156&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/control (original)
+++ trunk/packages/findlib/trunk/debian/control Sun Sep 17 11:25:12 2006
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml (>= 3.09.2), m4, gawk | awk, dpatch, cdbs
+Build-Depends: debhelper (>> 4.0.0), ocaml (>= 3.09.3), m4, gawk | awk, dpatch, cdbs
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/findlib
 

Modified: trunk/packages/findlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/rules?rev=3156&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/rules (original)
+++ trunk/packages/findlib/trunk/debian/rules Sun Sep 17 11:25:12 2006
@@ -2,19 +2,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-PKGNAME = ocaml-findlib
-
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES = $(patsubst %.in,%,$(shell ls debian/*.in debian/patches/*.in))
-HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-makebuilddir/$(PKGNAME):: ocamlinit
-
+PKGNAME=ocaml-findlib
 DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/tmp
 
 configure/$(PKGNAME)::
@@ -22,26 +12,26 @@
 	./configure \
 		-config /etc/ocamlfind.conf \
 		-bindir /usr/bin \
-		-sitelib $(OCAMLLIBDIR) \
+		-sitelib $(OCAML_STDLIB_DIR) \
 		-mandir /usr/share/man \
 		-with-toolbox
-ifeq ($(HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) opt
 else
 DEB_STRIP_EXCLUDE += usr/bin/ocamlfind
-DEB_STRIP_EXCLUDE += $(OCAMLLIBDIR)/findlib/make_wizard
+DEB_STRIP_EXCLUDE += $(OCAML_STDLIB_DIR)/findlib/make_wizard
 endif
 install/$(PKGNAME)::
 	# rm ocamlc.opt and similar settings, they're not avail everywhere in debian
 	grep -v \\.opt debian/tmp/etc/ocamlfind.conf > debian/ocamlfind.conf.new
 	mv debian/ocamlfind.conf.new debian/tmp/etc/ocamlfind.conf
 	# mv METAs from empty directories to the /META directory
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/ocaml/$(OCAMLABI)/METAS
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/ocaml/$(OCAML_ABI)/METAS
 	for p in `ls site-lib-src/`; do \
-	  mv $(CURDIR)/debian/tmp$(OCAMLLIBDIR)/$$p/META \
-	    $(CURDIR)/debian/tmp$(OCAMLLIBDIR)/METAS/META.$$p; \
-	  rmdir $(CURDIR)/debian/tmp$(OCAMLLIBDIR)/$$p/; \
+	  mv $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/$$p/META \
+	    $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/METAS/META.$$p; \
+	  rmdir $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/$$p/; \
 	done
 binary-install/$(PKGNAME)::
 	# rm 0 sized upstream timestamps