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

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep 17 14:24:24 2006
New Revision: 3166

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

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

Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=3166&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Sun Sep 17 14:24:24 2006
@@ -1,3 +1,13 @@
+ocamlnet (1.1-13) unstable; 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:23:02 +0200
+
 ocamlnet (1.1-12) unstable; urgency=low
 
   * debian/control

Modified: trunk/packages/ocamlnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=3166&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Sun Sep 17 14:24:24 2006
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), libpcre-ocaml-dev (>= 5.11.1), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), dpatch, cdbs
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.3), libpcre-ocaml-dev (>= 5.11.1), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), dpatch, cdbs
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlnet
 

Modified: trunk/packages/ocamlnet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/rules?rev=3166&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules (original)
+++ trunk/packages/ocamlnet/trunk/debian/rules Sun Sep 17 14:24:24 2006
@@ -2,22 +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
+include /usr/share/cdbs/1/class/ocaml.mk
 
 PKGNAME = libocamlnet-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)"
-
-NETDBDESTDIR = $(OCAMLLIBDIR)/netstring
+NETDBDESTDIR = $(OCAML_STDLIB_DIR)/netstring
 DEB_SRCDIR = $(CURDIR)/src
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp NETDBDESTDIR=$(CURDIR)/debian/tmp/netstring
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-makebuilddir/$(PKGNAME):: ocamlinit
 
 configure/$(PKGNAME)::
 	cd src/ && ./configure -enable-compatcgi -datadir $(NETDBDESTDIR)
@@ -30,8 +21,8 @@
 build/$(PKGNAME)::
 	mkdir -p debian/tmp
 common-install-impl::
-	mkdir -p debian/libocamlnet-ocaml$(OCAMLLIBDIR)/stublibs
-	mv debian/tmp/netstring/*.so debian/libocamlnet-ocaml$(OCAMLLIBDIR)/stublibs
+	mkdir -p debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
+	mv debian/tmp/netstring/*.so debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
 clean::
 	rm -f /src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cm*
 	rm -f /src/tmp/t.cm*