[Pkg-ocaml-maint-commits] r3124 - in /trunk/packages: gmetadom/branches/cdbs/ gmetadom/branches/cdbs/debian/ netclient/branches/cdbs/ netclient/branches/cdbs/debian/

[zack at users.alioth.debian.org]

Author: zack
Date: Thu Sep 14 08:29:22 2006
New Revision: 3124

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3124
Log:
branches for ocaml.mk: sample usage of the CDBS class

Added:
    trunk/packages/gmetadom/branches/cdbs/
      - copied from r3110, trunk/packages/gmetadom/trunk/
    trunk/packages/netclient/branches/cdbs/
      - copied from r3110, trunk/packages/netclient/trunk/
    trunk/packages/netclient/branches/cdbs/debian/changelog
      - copied, changed from r3113, trunk/packages/netclient/trunk/debian/changelog
    trunk/packages/netclient/branches/cdbs/debian/control
      - copied unchanged from r3113, trunk/packages/netclient/trunk/debian/control
Modified:
    trunk/packages/gmetadom/branches/cdbs/debian/changelog
    trunk/packages/gmetadom/branches/cdbs/debian/rules
    trunk/packages/netclient/branches/cdbs/debian/rules

Modified: trunk/packages/gmetadom/branches/cdbs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/gmetadom/branches/cdbs/debian/changelog?rev=3124&op=diff
==============================================================================
--- trunk/packages/gmetadom/branches/cdbs/debian/changelog (original)
+++ trunk/packages/gmetadom/branches/cdbs/debian/changelog Thu Sep 14 08:29:22 2006
@@ -1,3 +1,10 @@
+gmetadom (0.2.4-2+cdbs) unstable; urgency=low
+
+  * debian/rules
+    - use the ocaml.mk CDBS class
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 14 Sep 2006 10:20:33 +0200
+
 gmetadom (0.2.4-2) unstable; urgency=low
 
   * debian/rules

Modified: trunk/packages/gmetadom/branches/cdbs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/gmetadom/branches/cdbs/debian/rules?rev=3124&op=diff
==============================================================================
--- trunk/packages/gmetadom/branches/cdbs/debian/rules (original)
+++ trunk/packages/gmetadom/branches/cdbs/debian/rules Thu Sep 14 08:29:22 2006
@@ -1,18 +1,8 @@
 #!/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
 include /usr/share/cdbs/1/rules/dpatch.mk
-
-PKGNAME = libgdome2-ocaml-dev
-
-OCAMLABI := $(shell ocamlc -version)
-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_CONFIGURE_EXTRA_FLAGS = --with-modules="gdome_cpp_smart gdome_caml"
 

Copied: trunk/packages/netclient/branches/cdbs/debian/changelog (from r3113, trunk/packages/netclient/trunk/debian/changelog)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/netclient/branches/cdbs/debian/changelog?rev=3124&op=diff
==============================================================================
--- trunk/packages/netclient/trunk/debian/changelog (original)
+++ trunk/packages/netclient/branches/cdbs/debian/changelog Thu Sep 14 08:29:22 2006
@@ -1,3 +1,10 @@
+netclient (0.91-9+cdbs) unstable; urgency=low
+
+  * debian/rules
+    - use ocaml CDBS class
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 14 Sep 2006 10:25:25 +0200
+
 netclient (0.91-9) unstable; urgency=low
 
   * debian/control

Modified: trunk/packages/netclient/branches/cdbs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/netclient/branches/cdbs/debian/rules?rev=3124&op=diff
==============================================================================
--- trunk/packages/netclient/branches/cdbs/debian/rules (original)
+++ trunk/packages/netclient/branches/cdbs/debian/rules Thu Sep 14 08:29:22 2006
@@ -1,23 +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 = libnetclient-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)"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
 
-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)
-
-ifeq ($(HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) opt
 	$(MAKE) doc