The following commit has been merged in the master branch:
commit 88e2aafb0ca19332b7bd0317ea53f2c10357919a
Author: Stephane Glondu <st...@glondu.net>
Date:   Mon Jun 4 14:44:27 2012 +0200

    Misc updates

diff --git a/debian/META b/debian/META
deleted file mode 100644
index ca87309..0000000
--- a/debian/META
+++ /dev/null
@@ -1,4 +0,0 @@
-# META for config-file
-version="1.0"
-archive(byte)="config_file.cmo"
-archive(native)="config_file.cmx"
diff --git a/debian/control b/debian/control
index 086f7af..a36290c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: St├ęphane Glondu <glo...@debian.org>
 Build-Depends:
  debhelper (>= 8),
  dh-ocaml (>= 0.9),
+ ocaml-findlib,
  camlp4,
  ocaml-nox
 Standards-Version: 3.9.3
diff --git a/debian/libconfig-file-ocaml-dev.install.in 
b/debian/libconfig-file-ocaml-dev.install.in
index a4e27ce..c08f793 100644
--- a/debian/libconfig-file-ocaml-dev.install.in
+++ b/debian/libconfig-file-ocaml-dev.install.in
@@ -1,2 +1,2 @@
 config_file.mli                @OCamlStdlibDir@/config-file
-debian/META                    @OCamlStdlibDir@/config-file
+META                           @OCamlStdlibDir@/config-file
diff --git a/debian/rules b/debian/rules
index dfb387d..6be51cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
+export OCAMLFIND_DESTDIR=debian/libconfig-file-ocaml-dev/$(OCAML_STDLIB_DIR)
+
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
   BUILD_TARGET=all
 else
@@ -15,14 +17,17 @@ endif
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
        $(MAKE) $(BUILD_TARGET)
+       mkdir -p ocamldoc
        $(MAKE) doc
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-       $(MAKE) install 
INSTALLDIR=$(CURDIR)/debian/libconfig-file-ocaml-dev$(OCAML_STDLIB_DIR)/config-file
+       mkdir -p $(OCAMLFIND_DESTDIR)
+       $(MAKE) install
        mkdir -p 
$(CURDIR)/debian/libconfig-file-ocaml-dev/usr/share/doc/libconfig-file-ocaml-dev/html
        mv ocamldoc 
$(CURDIR)/debian/libconfig-file-ocaml-dev/usr/share/doc/libconfig-file-ocaml-dev/html/api
 
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-# Upstream test target is buggy, ignore it
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+       dh_auto_clean
+       rm -rf ocamldoc

-- 
ocaml-config-file packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to