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

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep 17 09:51:10 2006
New Revision: 3151

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3151
Log:
ready for ocaml 3.09.3 + cdbs

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

Modified: trunk/packages/calendar/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/calendar/trunk/debian/changelog?rev=3151&op=diff
==============================================================================
--- trunk/packages/calendar/trunk/debian/changelog (original)
+++ trunk/packages/calendar/trunk/debian/changelog Sun Sep 17 09:51:10 2006
@@ -1,3 +1,13 @@
+calendar (1.09.3-8) UNRELEASED; urgency=low
+
+  * debian/control
+    - changed build dependency from ocaml to ocaml-nox (no need of X for
+      calendar!)
+    - bumped build dependency on ocaml-nox to >= 3.09.3 since we now use the
+      ocaml.mk cdbs class shipped from that version on
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Sep 2006 11:30:10 +0200
+
 calendar (1.09.3-7) unstable; urgency=low
 
   * debian/rules

Modified: trunk/packages/calendar/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/calendar/trunk/debian/control?rev=3151&op=diff
==============================================================================
--- trunk/packages/calendar/trunk/debian/control (original)
+++ trunk/packages/calendar/trunk/debian/control Sun Sep 17 09:51:10 2006
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml (>= 3.09.2), ocaml-findlib (>= 1.1), dpatch, cdbs
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.3), 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/calendar
 

Modified: trunk/packages/calendar/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/calendar/trunk/debian/rules?rev=3151&op=diff
==============================================================================
--- trunk/packages/calendar/trunk/debian/rules (original)
+++ trunk/packages/calendar/trunk/debian/rules Sun Sep 17 09:51:10 2006
@@ -2,21 +2,11 @@
 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 = libcalendar-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 OCAML_LIB_DIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
-
+DEB_MAKE_INSTALL_TARGET = install OCAML_LIB_DIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
 configure/$(PKGNAME)::
 	./configure
 clean::