[Pkg-ocaml-maint-commits] [SCM] ocaml-csv packaging branch, master, updated. debian/1.1.6-3-20-g0241cfa

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 5467e489d273de91d56040a712e82549cccb8be1
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 3 17:04:54 2009 +0100

    Switch to dh-ocaml 0.9

diff --git a/debian/clean b/debian/clean
index c194c36..0ed4946 100644
--- a/debian/clean
+++ b/debian/clean
@@ -2,4 +2,3 @@ csvtool.byte
 csvtool.opt
 debian/csvtool.1
 test
-.depend
diff --git a/debian/control b/debian/control
index 984294d..90a2474 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7),
- dh-ocaml,
- ocaml-nox,
- ocaml-findlib,
- libextlib-ocaml-dev,
+ debhelper (>= 7.0.50~),
+ dh-ocaml (>= 0.9),
+ ocaml-nox (>= 3.11.1-3~),
+ ocaml-findlib (>= 1.2.5),
+ libextlib-ocaml-dev (>= 1.5.1-5~),
  xsltproc,
  docbook-xsl
 Standards-Version: 3.8.0
@@ -20,12 +20,13 @@ Package: libcsv-ocaml-dev
 Section: libdevel
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
- libextlib-ocaml-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Suggests: csvtool
-Description: A library to read and write CSV files in OCaml
+Description: a library to read and write CSV files in OCaml
  OCaml CSV is a library to read and write CSV (comma-separated values)
  files.  It also supports all extensions used by Excel - eg. quotes,
  newlines, 8 bit characters in fields, etc.
@@ -36,8 +37,11 @@ Description: A library to read and write CSV files in OCaml
 Package: csvtool
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}
-Description: A handy command line tool for handling CSV files
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: a handy command line tool for handling CSV files
  OCaml CSV is a library to read and write CSV (comma-separated values)
  files.  It also supports all extensions used by Excel - eg. quotes,
  newlines, 8 bit characters in fields, etc.
diff --git a/debian/libcsv-ocaml-dev.doc-base b/debian/libcsv-ocaml-dev.doc-base
new file mode 100644
index 0000000..aeda675
--- /dev/null
+++ b/debian/libcsv-ocaml-dev.doc-base
@@ -0,0 +1,8 @@
+Document: libcsv-ocaml-dev-ocamldoc-api-reference
+Title: OCaml-CSV OCamldoc API Reference
+Abstract: API reference manual for libcsv-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libcsv-ocaml-dev/html/index.html
+Files: /usr/share/doc/libcsv-ocaml-dev/html/*
diff --git a/debian/rules b/debian/rules
index 8409e03..87ad936 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/ocaml/ocamlvars.mk
 
 export OCAMLFIND_DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 
@@ -19,39 +14,27 @@ OPTTARGET := $(if $(OCAML_OPT_ARCH),opt)
 DB2MAN := /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
 XP := xsltproc -''-nonet
 
+%:
+	dh --with ocaml $@
+
 debian/csvtool.1: debian/csvtool.dbk
 	$(XP) -o $@ $(DB2MAN) $<
 
-build: debian/csvtool.1 build-stamp
-build-stamp: ocamlinit
-	dh build --before dh_auto_build
+.PHONY: override_dh_auto_build
+override_dh_auto_build: debian/csvtool.1
 	$(MAKE) depend
 	$(MAKE) OCAMLCINCS="-package extlib" OCAMLCLIBS="-linkpkg" OCAMLOPTLIBS="-linkpkg" byte $(OPTTARGET) doc
 	$(MAKE) OCAMLCINCS="-package extlib" OCAMLCLIBS="-linkpkg" OCAMLOPTLIBS="-linkpkg" test
-	dh build --after dh_auto_test
-	touch $@
 
-clean: ocamlinit-clean
-	dh $@
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -Rf html
 	cp debian/upstream.depend .depend
 
-install: install-stamp
-install-stamp: build-stamp
-	dh install --before dh_auto_install
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	mkdir -p $(OCAMLFIND_DESTDIR)
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
 	$(MAKE) install
 	cp csvtool.$(OCAML_BEST) $(CURDIR)/debian/tmp/usr/bin/csvtool
-	dh install --after dh_auto_install
-
-binary-indep:
-	# No binary-indep packages
-
-binary-arch: install-stamp
-	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/libcsv-ocaml-dev.substvars
-	echo 'F:OCamlRun=$(OCAML_RUN)' >> debian/csvtool.substvars
-	dh $@
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit

-- 
ocaml-csv packaging