Do not ship labltk examples in a tarball

diff --git a/debian/clean b/debian/clean
index c1659bf545893b75735c3c3eb3c65423a207dda8..14fe0e4dfe2ec1bcb72029ef9ad9cc5d643ed231 100644 (file)
--- 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 309932390b04c63a021dd168765480d194ca2435..aaea2824ce0f24041988d17e848da816398c7526 100644 (file)
--- 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 bdc454681e9472373189fec3816c2e70f9bbbaeb..55b78ae3f53b946729583ea119cceab050737fc7 100644 (file)
--- 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 904bbd724c9809618881756590659e0a3801a246..f4d4038855ef6b773a61643ded71677b2b351c6d 100755 (executable)
--- 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