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

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep 17 14:40:05 2006
New Revision: 3170

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

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

Modified: trunk/packages/pxp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/changelog?rev=3170&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/changelog (original)
+++ trunk/packages/pxp/trunk/debian/changelog Sun Sep 17 14:40:05 2006
@@ -1,3 +1,13 @@
+pxp (1.1.96-8) UNRELEASED; urgency=low
+
+  * debian/rules
+    - use ocaml.mk
+  * debian/control
+    - bumped build dependency on ocaml-nox to >= 3.09.3, since we now use
+      ocaml.mk
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Sep 2006 16:37:53 +0200
+
 pxp (1.1.96-7) unstable; urgency=low
 
   * debian/control

Modified: trunk/packages/pxp/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/control?rev=3170&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/control (original)
+++ trunk/packages/pxp/trunk/debian/control Sun Sep 17 14:40:05 2006
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-12), ocaml-ulex (>= 0.8-2), dpatch, cdbs
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.3), ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-12), ocaml-ulex (>= 0.8-2), dpatch, cdbs
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pxp
 

Modified: trunk/packages/pxp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/rules?rev=3170&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/rules (original)
+++ trunk/packages/pxp/trunk/debian/rules Sun Sep 17 14:40:05 2006
@@ -2,25 +2,16 @@
 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 = libpxp-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)"
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-makebuilddir/$(PKGNAME):: ocamlinit
-
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
 
 configure/$(PKGNAME)::
 	./configure -without-wlex -without-wlex-compat
 	rm -f README	# it's a symlink, the real one is doc/README
-ifeq ($(HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) opt
 endif