[Pkg-ocaml-maint-commits] [findlib] 04/06: Update packaging

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch sid/master
in repository findlib.

commit 6a01bdbf588966205ae3327ed96ef013937e2233
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 17 17:12:03 2015 +0100

    Update packaging
---
 debian/libfindlib-ocaml-dev.install.in | 4 ++++
 debian/libfindlib-ocaml.install.in     | 4 ++++
 debian/ocaml-findlib.install           | 2 +-
 debian/rules                           | 3 ++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/libfindlib-ocaml-dev.install.in b/debian/libfindlib-ocaml-dev.install.in
index 0a65ffb..1c69000 100644
--- a/debian/libfindlib-ocaml-dev.install.in
+++ b/debian/libfindlib-ocaml-dev.install.in
@@ -6,3 +6,7 @@
 @OCamlStdlibDir@/num-top/*
 OPT: @OCamlStdlibDir@/findlib/*.a
 OPT: @OCamlStdlibDir@/findlib/*.cmxa
+ at OCamlStdlibDir@/bytes/*.cmi
+OPT: @OCamlStdlibDir@/bytes/*.cmx
+OPT: @OCamlStdlibDir@/bytes/*.a
+OPT: @OCamlStdlibDir@/bytes/*.cmxa
diff --git a/debian/libfindlib-ocaml.install.in b/debian/libfindlib-ocaml.install.in
index 5de1fcb..dd67fb9 100644
--- a/debian/libfindlib-ocaml.install.in
+++ b/debian/libfindlib-ocaml.install.in
@@ -2,3 +2,7 @@ etc/ocamlfind.conf
 @OCamlStdlibDir@/METAS
 @OCamlStdlibDir@/findlib/META
 @OCamlStdlibDir@/findlib/findlib.cma
+DYN: @OCamlStdlibDir@/findlib/findlib.cmxs
+ at OCamlStdlibDir@/bytes/META
+ at OCamlStdlibDir@/bytes/bytes.cma
+DYN: @OCamlStdlibDir@/bytes/bytes.cmxs
diff --git a/debian/ocaml-findlib.install b/debian/ocaml-findlib.install
index 97eca2c..39e49e4 100644
--- a/debian/ocaml-findlib.install
+++ b/debian/ocaml-findlib.install
@@ -1,4 +1,4 @@
 usr/bin/ocamlfind
 usr/bin/safe_camlp4
 usr/share/man
-debian/bash_completion/*    /etc/bash_completion.d/
+debian/bash_completion/*    /usr/share/bash-completion/completions
diff --git a/debian/rules b/debian/rules
index 7ecb696..9bf80a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,11 @@ override_dh_auto_install:
 # mv METAs from empty directories to the /META directory
 	mkdir -p $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/METAS
 	for p in `ls site-lib-src/`; do \
+	 if [ "$$p" != "bytes" ]; then \
 	  mv $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/$$p/META \
 	    $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/METAS/META.$$p; \
 	  rmdir $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/$$p/; \
+	 fi; \
 	done
 # rm empty man3 dir
 	test -d $(CURDIR)/debian/tmp/usr/share/man/man3 && \
@@ -52,7 +54,6 @@ endif
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
 	if [ -f Makefile.config ]; then $(MAKE) clean; fi
-	-find . -name META -delete
 	-rm -f Makefile.config ocargs.log src/findlib/ocaml_args.ml
 	-rm -Rf site-lib-src/camlp4/
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/findlib.git