ready for 3.09.3 and ocaml.mk

diff --git a/DEVEL/lablgtkmathview/debian/changelog b/DEVEL/lablgtkmathview/debian/changelog
index 143347d3b744d090ccc09a87a6f7e1d92315e178..ff74d8d21e468daef138d258851eb89cfd83da47 100644 (file)
--- a/DEVEL/lablgtkmathview/debian/changelog
+++ b/DEVEL/lablgtkmathview/debian/changelog
@@ -1,3 +1,13 @@
+lablgtkmathview (0.7.3-2) UNRELEASED; urgency=low
+
+  * debian/rules
+    - use ocaml.mk cdbs class
+  * debian/control
+    - bumped build dependency on ocaml-nox to >= 3.09.3 since we now use
+      ocaml.mk
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 17 Sep 2006 15:39:26 +0200
+
 lablgtkmathview (0.7.3-1) unstable; urgency=low
 
   * debian/*.dirs

diff --git a/DEVEL/lablgtkmathview/debian/control b/DEVEL/lablgtkmathview/debian/control
index 7ec8d0dfbdc0135b046f7d1184ffc64e587abe98..caafcb1f7e622cc962c22cae95ac0ab02cf47596 100644 (file)
--- a/DEVEL/lablgtkmathview/debian/control
+++ b/DEVEL/lablgtkmathview/debian/control
@@ -2,7 +2,7 @@ Source: lablgtkmathview
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 4.0.0), cdbs, ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.1), liblablgtk2-ocaml-dev (>= 2.6.0-2), libgdome2-ocaml-dev (>= 0.2.3-5), libgtkmathview-dev (>= 0.7.5), pkg-config
+Build-Depends: debhelper (>> 4.0.0), cdbs, ocaml-nox (>= 3.09.3), ocaml-findlib (>= 1.1), liblablgtk2-ocaml-dev (>= 2.6.0-2), libgdome2-ocaml-dev (>= 0.2.3-5), libgtkmathview-dev (>= 0.7.5), pkg-config
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://mowgli.cs.unibo.it/trunk/helm/software/DEVEL/lablgtkmathview
 

diff --git a/DEVEL/lablgtkmathview/debian/rules b/DEVEL/lablgtkmathview/debian/rules
index 0a44aca185000d4f77ebb76987ad43c1ad7fd317..89b1045980681ec0a7a50211ffa04687c899ddd9 100755 (executable)
--- a/DEVEL/lablgtkmathview/debian/rules
+++ b/DEVEL/lablgtkmathview/debian/rules
@@ -1,17 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-PKGNAME = liblablgtkmathview-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 PREFIX=$(CURDIR)/debian/tmp$(OCAMLLIBDIR)
+DEB_MAKE_INSTALL_TARGET = install PREFIX=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)