[Pkg-ocaml-maint-commits] [SCM] ocaml-csv packaging branch, master, updated. debian/1.2.0-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 68ae5c6945ae6b25cba84de7a9cc5a76f10a1841
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Mon Mar 1 23:28:52 2010 +0100

    Adapt debian/rules et al to new upstream

diff --git a/debian/clean b/debian/clean
index 0ed4946..f4c6ca1 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,4 +1,13 @@
-csvtool.byte
-csvtool.opt
+examples/csvtool.exe
+examples/*.cmi
+examples/*.cmo
+examples/.depend.ocaml
+examples/csvtool
+examples/csvtool.annot
+examples/example.annot
+examples/example.exe
+tests/test.exe
+tests/.depend.ocaml
+src/.depend.ocaml
+src/META
 debian/csvtool.1
-test
diff --git a/debian/control b/debian/control
index b7d2e1c..3c8b945 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,9 @@
 Source: ocaml-csv
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stéphane Glondu <glondu at debian.org>
+Uploaders: 
+ Stéphane Glondu <glondu at debian.org>,
+ Sylvain Le Gall <gildor at debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
  dh-ocaml (>= 0.9),
diff --git a/debian/csvtool.dirs b/debian/csvtool.dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/csvtool.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/csvtool.install b/debian/csvtool.install
index 3146b91..fbe4aab 100644
--- a/debian/csvtool.install
+++ b/debian/csvtool.install
@@ -1 +1 @@
-usr/bin/csvtool
+examples/csvtool /usr/bin/
diff --git a/debian/libcsv-ocaml-dev.dirs.in b/debian/libcsv-ocaml-dev.dirs.in
deleted file mode 100644
index 93da81a..0000000
--- a/debian/libcsv-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
- at OCamlStdlibDir@/csv
-usr/share/doc/libcsv-ocaml-dev/html
-usr/share/doc/libcsv-ocaml-dev/examples
diff --git a/debian/libcsv-ocaml-dev.doc-base b/debian/libcsv-ocaml-dev.doc-base
deleted file mode 100644
index aeda675..0000000
--- a/debian/libcsv-ocaml-dev.doc-base
+++ /dev/null
@@ -1,8 +0,0 @@
-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/libcsv-ocaml-dev.examples b/debian/libcsv-ocaml-dev.examples
new file mode 100644
index 0000000..276da56
--- /dev/null
+++ b/debian/libcsv-ocaml-dev.examples
@@ -0,0 +1,2 @@
+examples/*.ml
+examples/*.csv
diff --git a/debian/libcsv-ocaml-dev.install.in b/debian/libcsv-ocaml-dev.install.in
deleted file mode 100644
index 149c63b..0000000
--- a/debian/libcsv-ocaml-dev.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
- at OCamlStdlibDir@/csv/*
-html/* usr/share/doc/libcsv-ocaml-dev/html
-example* usr/share/doc/libcsv-ocaml-dev/examples
diff --git a/debian/libcsv-ocaml-dev.ocamldoc b/debian/libcsv-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..c01ade2
--- /dev/null
+++ b/debian/libcsv-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# Nothing
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 60b1cee..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Use-extlib.patch
-0002-Various-improvements-in-the-Makefile.patch
diff --git a/debian/rules b/debian/rules
index 87ad936..ab08b8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
-export OCAMLFIND_DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR := $(CURDIR)/debian/libcsv-ocaml-dev/$(OCAML_STDLIB_DIR)
 
 OCAML_RUN := $(if $(OCAML_OPT_ARCH),ocaml-base-nox-$(OCAML_ABI))
 OPTTARGET := $(if $(OCAML_OPT_ARCH),opt)
@@ -22,19 +22,11 @@ debian/csvtool.1: debian/csvtool.dbk
 
 .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
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -Rf html
-	cp debian/upstream.depend .depend
+	$(MAKE) byte $(OPTTARGET) 
+	$(MAKE) tests
+	$(MAKE) examples
 
 .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
diff --git a/debian/upstream.depend b/debian/upstream.depend
deleted file mode 100644
index 14f7302..0000000
--- a/debian/upstream.depend
+++ /dev/null
@@ -1,8 +0,0 @@
-csv.cmo: csv.cmi 
-csv.cmx: csv.cmi 
-csvtool.cmo: csv.cmi 
-csvtool.cmx: csv.cmx 
-example.cmo: csv.cmi 
-example.cmx: csv.cmx 
-test.cmo: csv.cmi 
-test.cmx: csv.cmx 

-- 
ocaml-csv packaging