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

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep 17 11:39:00 2006
New Revision: 3157

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

Modified:
    trunk/packages/pcre-ocaml/trunk/debian/changelog
    trunk/packages/pcre-ocaml/trunk/debian/control
    trunk/packages/pcre-ocaml/trunk/debian/rules

Modified: trunk/packages/pcre-ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/changelog?rev=3157&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/changelog Sun Sep 17 11:39:00 2006
@@ -1,3 +1,12 @@
+pcre-ocaml (5.11.1-2) UNRELEASED; urgency=low
+
+  * debian/rules
+    - use ocaml.mk cdbs class
+  * debian/control
+    - bumped ocaml-nox build dependency to >= 3.09.3 since we now use ocaml.mk
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Sep 2006 13:37:42 +0200
+
 pcre-ocaml (5.11.1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/pcre-ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/control?rev=3157&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/control (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/control Sun Sep 17 11:39:00 2006
@@ -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.2), ocaml-findlib (>= 1.1), cdbs, dpatch
+Build-Depends: debhelper (>= 4.1.0), libpcre3-dev (>= 4.5), ocaml-nox (>= 3.09.3), ocaml-findlib (>= 1.1), cdbs, dpatch
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pcre-ocaml
 

Modified: trunk/packages/pcre-ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/rules?rev=3157&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/rules (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/rules Sun Sep 17 11:39:00 2006
@@ -1,20 +1,14 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
 PKGNAME = libpcre-ocaml-dev
-
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
-
-DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
+DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 DOCDIR = $(CURDIR)/debian/doc/html
 
-ifeq ($(HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	DEB_MAKE_BUILD_TARGET = opt NO_CUSTOM=y
 	DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR) NATIVE=true
 else
@@ -22,11 +16,9 @@
 	DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 endif
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-makebuilddir/$(PKGNAME):: ocamlinit
 build/$(PKGNAME)::
 	mkdir -p $(DESTDIR) $(DOCDIR)
 	ocamldoc -html -m A -keep-code -d $(DOCDIR) lib/pcre.mli
-cleanbuilddir/$(PKGNAME)::
-	rm -rf debian/doc
+clean::
+	rm -rf debian/doc ocamldoc-stamp
+