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

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep 17 10:48:10 2006
New Revision: 3152

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

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

Modified: trunk/packages/extlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/changelog?rev=3152&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/changelog (original)
+++ trunk/packages/extlib/trunk/debian/changelog Sun Sep 17 10:48:10 2006
@@ -1,3 +1,14 @@
+extlib (1.5-6) unstable; urgency=low
+
+  * debian/rules
+    - switched to cdbs
+  * debian/control
+    - bumped build dependency on ocaml-nox to >= 3.09.3 since we now rely on
+      the ocaml.mk cdbs class
+    - added build dependency on cdbs
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Sep 2006 12:39:05 +0200
+
 extlib (1.5-5) unstable; urgency=low
 
   * debian/rules

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

Modified: trunk/packages/extlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/rules?rev=3152&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/rules (original)
+++ trunk/packages/extlib/trunk/debian/rules Sun Sep 17 10:48:10 2006
@@ -1,38 +1,14 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
 PKGNAME = libextlib-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
-
 PKGDIR = $(CURDIR)/debian/$(PKGNAME)
-DESTDIR = $(PKGDIR)$(OCAMLLIBDIR)/extlib
+DESTDIR = $(PKGDIR)$(OCAML_STDLIB_DIR)/extlib
 DOCDIR = $(PKGDIR)/usr/share/doc/$(PKGNAME)/
 
-include /usr/share/dpatch/dpatch.make
-
-build:
-clean: patch clean1 unpatch
-
-clean1:
-	dh_testdir
-	dh_testroot
-
-	rm -f *.cm[aiox] *.cmxa *.[ao] META
-
-	dh_clean
-
-install: ocamlinit patch-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-
+common-build-arch::
 	mkdir -p $(DESTDIR)/ $(DOCDIR)/
 	if [ -x /usr/bin/ocamlopt ]; then \
 		ocaml install.ml -d $(DESTDIR)/ -b -n -doc; \
@@ -43,20 +19,4 @@
 	cp -a META.txt $(DESTDIR)/META
 	mv $(DESTDIR)/extlib-doc/ $(DOCDIR)/html
 
-binary: binary-indep binary-arch
-binary-indep: install
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol $(DEB_DH_GENCONTROL_ARGS)
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: build clean binary-indep binary-arch binary install
+include /usr/share/cdbs/1/rules/dpatch.mk