[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.6-3-8-gd9139b0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit cef951a290808814be5733704ae07230500878ff
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 11 14:19:06 2009 +0200

    Update packaging

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..3ed5a3f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+mlpost.mli
+myocamlbuild.ml
+ocamlbuild.Makefile
+simple.Makefile
diff --git a/debian/control b/debian/control
index 033cc0c..75bdabb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,8 @@ Build-Depends:
  debhelper (>= 7),
  dh-ocaml,
  cdbs,
+ libcairo-ocaml-dev,
+ libbitstring-ocaml-dev,
  ocaml-nox (>= 3.11.1)
 Standards-Version: 3.8.2
 Section: tex
@@ -19,6 +21,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ libcairo-ocaml-dev,
+ libbitstring-ocaml-dev,
  ocaml-nox-${F:OCamlABI},
  context,
  texlive-latex-base,
diff --git a/debian/mlpost.docs b/debian/mlpost.docs
index 86ffa43..38cfd10 100644
--- a/debian/mlpost.docs
+++ b/debian/mlpost.docs
@@ -1,3 +1,2 @@
 FAQ
 README.txt
-html
diff --git a/debian/mlpost.install.in b/debian/mlpost.install.in
index f15b300..93b3e67 100644
--- a/debian/mlpost.install.in
+++ b/debian/mlpost.install.in
@@ -1,2 +1,4 @@
-mlpost.mli @OCamlStdlibDir@/mlpost
-META @OCamlStdlibDir@/mlpost
+usr
+_build/doc/*.html       /usr/share/doc/mlpost/html
+_build/doc/style.css    /usr/share/doc/mlpost/html
+_build/doc/img/*.png    /usr/share/doc/mlpost/html/img
diff --git a/debian/rules b/debian/rules
index d5215d7..725274d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,27 +4,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
-DESTDIR = $(CURDIR)/debian/mlpost/$(OCAML_STDLIB_DIR)/mlpost
-PREFIX = $(CURDIR)/debian/mlpost/usr
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)/mlpost
+PREFIX = $(CURDIR)/debian/tmp/usr
+DEB_INSTALL_DIRS_ALL = -Pdebian/tmp
 DEB_MAKE_INSTALL_TARGET = install LIBDIR=$(DESTDIR) prefix=$(PREFIX)
 DEB_MAKE_BUILD_TARGET = all doc
 
-FILES_TO_BACKUP = .depend version.ml scan_prelude.ml
 EXAMPLES_TARBALL = debian/examples.tar.gz
 
 pre-build::
 	tar -czf $(EXAMPLES_TARBALL) --exclude=parse.ml examples
-# Backup generated files
-	for u in $(FILES_TO_BACKUP); do \
-	  if [ ! -f debian/$$u.backup ]; then cp $$u debian/$$u.backup; fi \
-	done
 
 clean::
-	rm -Rf $(EXAMPLES_TARBALL) html tool.byte
-# Restore upstream tree
-	for u in $(FILES_TO_BACKUP); do \
-	  if [ -f debian/$$u.backup ]; then mv debian/$$u.backup $$u; fi \
-	done
-
-common-install-prehook-impl::
-	mv doc html
+	rm -Rf $(EXAMPLES_TARBALL)

-- 
mlpost packaging