[Pkg-ocaml-maint-commits] [SCM] ocaml-csv packaging branch, master, updated. debian/1.3.0-2-3-g1fdfc01

[Stephane Glondu]

The following commit has been merged in the master branch:
commit ab4ca107312ba3d851c455e40901848be5ebc45d
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 7 12:25:50 2013 +0200

    Fix packaging

diff --git a/debian/csvtool.install b/debian/csvtool.install
index c96841b..415f082 100644
--- a/debian/csvtool.install
+++ b/debian/csvtool.install
@@ -1 +1 @@
-_build/examples/csvtool /usr/bin
+/usr/bin
diff --git a/debian/libcsv-ocaml-dev.install.in b/debian/libcsv-ocaml-dev.install.in
new file mode 100644
index 0000000..cc51687
--- /dev/null
+++ b/debian/libcsv-ocaml-dev.install.in
@@ -0,0 +1 @@
+ at OCamlStdlibDir@
diff --git a/debian/rules b/debian/rules
index 1b960a6..91c2079 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DESTDIR=$(CURDIR)/debian/libcsv-ocaml-dev
+DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/ocaml/ocamlvars.mk
 
@@ -22,11 +22,6 @@ override_dh_auto_configure:
 .PHONY: override_dh_auto_build
 override_dh_auto_build: debian/csvtool.1
 	ocaml setup.ml -build
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	mv -f _build/examples/csvtool.native _build/examples/csvtool
-else
-	mv -f _build/examples/csvtool.byte _build/examples/csvtool
-endif
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
@@ -36,8 +31,11 @@ override_dh_auto_test:
 override_dh_auto_install:
 	mkdir -p '$(OCAMLFIND_DESTDIR)'
 	ocaml setup.ml -install
-	rm -rf $(DESTDIR)/usr/bin
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
 	ocaml setup.ml -distclean
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing

-- 
ocaml-csv packaging