[Pkg-ocaml-maint-commits] r2005 - trunk/packages/calendar/trunk/debian

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-12 18:38:15 +0000 (Sat, 12 Nov 2005)
New Revision: 2005

Modified:
   trunk/packages/calendar/trunk/debian/changelog
   trunk/packages/calendar/trunk/debian/control
   trunk/packages/calendar/trunk/debian/control.in
   trunk/packages/calendar/trunk/debian/dirs
   trunk/packages/calendar/trunk/debian/rules
Log:
cdbs


Modified: trunk/packages/calendar/trunk/debian/changelog
===================================================================
--- trunk/packages/calendar/trunk/debian/changelog	2005-11-12 18:22:41 UTC (rev 2004)
+++ trunk/packages/calendar/trunk/debian/changelog	2005-11-12 18:38:15 UTC (rev 2005)
@@ -3,6 +3,9 @@
   * Rebuilt with ocaml 3.09
   * debian/*
     - removed hard coding of ocaml abi version
+    - use cdbs
+  * debian/control
+    - bumped standards version
 
  -- Stefano Zacchiroli <zack at debian.org>  Tue,  8 Nov 2005 22:54:00 +0100
 

Modified: trunk/packages/calendar/trunk/debian/control
===================================================================
--- trunk/packages/calendar/trunk/debian/control	2005-11-12 18:22:41 UTC (rev 2004)
+++ trunk/packages/calendar/trunk/debian/control	2005-11-12 18:38:15 UTC (rev 2005)
@@ -2,8 +2,8 @@
 Section: libdevel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml (>= 3.09), ocaml-findlib, dpatch
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 4.0.0), ocaml (>= 3.09.0), ocaml-findlib (>= 1.1), dpatch, cdbs
+Standards-Version: 3.6.2
 
 Package: libcalendar-ocaml-dev
 Architecture: any

Modified: trunk/packages/calendar/trunk/debian/control.in
===================================================================
--- trunk/packages/calendar/trunk/debian/control.in	2005-11-12 18:22:41 UTC (rev 2004)
+++ trunk/packages/calendar/trunk/debian/control.in	2005-11-12 18:38:15 UTC (rev 2005)
@@ -2,8 +2,8 @@
 Section: libdevel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml (>= @OCamlABI@), ocaml-findlib, dpatch
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 4.0.0), ocaml (>= @OCamlABI@), ocaml-findlib (>= 1.1), dpatch, cdbs
+Standards-Version: 3.6.2
 
 Package: libcalendar-ocaml-dev
 Architecture: any

Modified: trunk/packages/calendar/trunk/debian/dirs
===================================================================
--- trunk/packages/calendar/trunk/debian/dirs	2005-11-12 18:22:41 UTC (rev 2004)
+++ trunk/packages/calendar/trunk/debian/dirs	2005-11-12 18:38:15 UTC (rev 2005)
@@ -1 +1 @@
-usr/lib/ocaml/3.09
+usr/lib/ocaml/3.09.0

Modified: trunk/packages/calendar/trunk/debian/rules
===================================================================
--- trunk/packages/calendar/trunk/debian/rules	2005-11-12 18:22:41 UTC (rev 2004)
+++ trunk/packages/calendar/trunk/debian/rules	2005-11-12 18:38:15 UTC (rev 2005)
@@ -1,65 +1,24 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
+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/dpatch/dpatch.make
-
-OCAML_LIB_DIR = := $(shell ocamlc -where)
 PKGNAME = libcalendar-ocaml-dev
+
 OCAMLABI := $(shell ocamlc -version)
-IN_FILES := $(shell ls debian/*.in)
-GEN_FILES = $(patsubst %.in,%,$(IN_FILES))
+OCAMLLIBDIR := $(shell ocamlc -where)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install OCAML_LIB_DIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 
-init: $(GEN_FILES)
-%: %.in
-	sed -e 's/@OCamlABI@/$(OCAMLABI)/' $< > $@
-
-config.status: configure
-	dh_testdir
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
+configure/$(PKGNAME)::
 	./configure
-
-build: build-stamp
-build-stamp:  patch-stamp config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	-$(MAKE) clean
-	-rm -rf debian/html/
-	rm -f config.{cache,log,status} Makefile
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(MAKE) install OCAML_LIB_DIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_LIB_DIR)
-
-binary: binary-arch
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
+clean::
+	rm -rf debian/html/
+binary-install/$(PKGNAME)::
 	mv $(CURDIR)/debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/{doc,html}
-	dh_installexamples
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: build clean binary-arch binary install 
+# work around cdbs' bug
+unpatch: deapply-dpatches