[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.0-1-26-g3d9a28d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 766a3c572b4c5684154849ee254e80ab46cccbf4
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 17 13:56:13 2009 +0100

    Do not ship labltk examples in a tarball

diff --git a/debian/clean b/debian/clean
index c1659bf..14fe0e4 100644
--- a/debian/clean
+++ b/debian/clean
@@ -6,4 +6,3 @@ config/m.h
 config/s.h
 myocamlbuild_config.ml
 tools/myocamlbuild_config.ml
-debian/examples_labltk.tar.bz2
diff --git a/debian/ocaml.dirs.in b/debian/ocaml.dirs.in
index 3099323..aaea282 100644
--- a/debian/ocaml.dirs.in
+++ b/debian/ocaml.dirs.in
@@ -1,3 +1,3 @@
 usr/bin
-usr/share/doc/ocaml
+usr/share/doc/ocaml/examples
 @OCamlStdlibDir@
diff --git a/debian/ocaml.examples b/debian/ocaml.examples
index bdc4546..55b78ae 100644
--- a/debian/ocaml.examples
+++ b/debian/ocaml.examples
@@ -1 +1 @@
-debian/examples_labltk.tar.bz2
+debian/examples/*
diff --git a/debian/rules b/debian/rules
index 904bbd7..f4d4038 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,9 +89,9 @@ build-stamp: config-stamp
 	if test ! -d boot.debian; then \
 	  cp -xa boot boot.debian; \
 	fi
-	tar cjf debian/examples_labltk.tar.bz2 \
-	  -C otherlibs/labltk --exclude=.cvsignore \
-	  examples_labltk
+	rm -Rf debian/examples && mkdir debian/examples
+	cp -a otherlibs/labltk/examples_labltk debian/examples/labltk
+	find debian/examples/labltk -name .cvsignore -delete
 ifeq ($(BUILDCACHE),)
 	$(MAKE) world
 	$(MAKE) bootstrap
@@ -130,7 +130,7 @@ endif
 		sed -i 1d emacs/ocamltags.in; \
 	fi
 # Remaining stuff
-	-rm -Rf debian/$(SRCTARBALL)
+	-rm -Rf debian/$(SRCTARBALL) debian/examples
 	dh clean --after dh_auto_clean
 
 install: install-stamp
@@ -171,7 +171,9 @@ install-stamp:
 # Remove empty directory
 	rmdir $(CURDIR)/debian/ocaml-nox$(OCAML_STDLIB_DIR)/ocamldoc/custom
 # Remaining stuff
-	dh install --after dh_install
+	dh install --after dh_install --before dh_compress
+	dh_compress -Xexamples/labltk
+	dh install --after dh_compress
 	touch $@
 
 binary-stamp: install-stamp

-- 
OCaml packaging