[Pkg-ocaml-maint-commits] r1948 - trunk/packages/pcre-ocaml/trunk/debian

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-09 08:12:12 +0000 (Wed, 09 Nov 2005)
New Revision: 1948

Modified:
   trunk/packages/pcre-ocaml/trunk/debian/control
   trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install
   trunk/packages/pcre-ocaml/trunk/debian/rules
Log:
better integration with cdbs, to be used as future reference for other ocaml packages cdbs-based(?)


Modified: trunk/packages/pcre-ocaml/trunk/debian/control
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/control	2005-11-09 04:32:22 UTC (rev 1947)
+++ trunk/packages/pcre-ocaml/trunk/debian/control	2005-11-09 08:12:12 UTC (rev 1948)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.1.0), libpcre3-dev (>= 4.5), ocaml-nox (>= 3.09), ocaml-findlib, cdbs, dpatch
+Build-Depends: debhelper (>= 4.1.0), libpcre3-dev (>= 4.5), ocaml-nox (>= 3.08.3), ocaml-findlib, cdbs, dpatch
 Standards-Version: 3.6.2
 
 Package: libpcre-ocaml

Modified: trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install	2005-11-09 04:32:22 UTC (rev 1947)
+++ trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install	2005-11-09 08:12:12 UTC (rev 1948)
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/*/pcre/*.so	usr/lib/ocaml/3.09/stublibs/
+debian/tmp/usr/lib/ocaml/*/pcre/*.so	usr/lib/ocaml/3.08.3/stublibs/

Modified: trunk/packages/pcre-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/rules	2005-11-09 04:32:22 UTC (rev 1947)
+++ trunk/packages/pcre-ocaml/trunk/debian/rules	2005-11-09 08:12:12 UTC (rev 1948)
@@ -2,19 +2,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-unpatch: deapply-dpatches	# work around cdbs' bug
 
 OCAMLABI := $(shell ocamlc -version)
-IN_FILES := $(shell ls debian/*.in)
-GEN_FILES := $(patsubst %.in,%,$(IN_FILES))
-
-init: $(GEN_FILES)
-%: %.in
-	sed -e 's/@OCamlABI@/$(OCAMLABI)/' $< > $@
-
-HAVE_OCAMLOPT = $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DESTDIR := $(CURDIR)/debian/tmp$(shell ocamlc -where)
 DOCDIR = $(CURDIR)/debian/doc/html
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 	DEB_MAKE_BUILD_TARGET = opt NO_CUSTOM=y
@@ -24,8 +18,15 @@
 	DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 endif
 
-common-install-prehook-arch::
+makebuilddir/libpcre-ocaml-dev:: ocamlinit
+build/libpcre-ocaml-dev::
 	mkdir -p $(DESTDIR) $(DOCDIR)
 	ocamldoc -html -m A -keep-code -d $(DOCDIR) lib/pcre.mli
-clean::
+cleanbuilddir/libpcre-ocaml-dev::
 	rm -rf debian/doc
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
+
+# work around cdbs' bug
+unpatch: deapply-dpatches
+