[Pkg-ocaml-maint-commits] [SCM] ocamlmakefile packaging branch, experimental/master, updated. debian/6.36.0-2-8-g8dc01e3

[Ralf Treinen]

The following commit has been merged in the experimental/master branch:
commit 8dc01e3c19f841462cc46887b8e5bf0a10e782f4
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Oct 9 19:56:35 2012 +0200

    improve debian/rules: first build files in builddir/, then use debhelper
    tools to install.

diff --git a/debian/changelog b/debian/changelog
index 6db3b6b..ce7802e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,12 @@ ocamlmakefile (6.37.0-1) experimental; urgency=low
     - dh_installchangelogs invocation: upstream has renamed Changelog to
       CHANGES.txt
   * Standards-Version 3.9.4 (no change)
+  * Migrate debian/rules to dh(1):
+    - debian/rules: build modified version of OCamlMakefile and of the examples
+      in temporary directory builddir.
+    - add files debian/ocamlmakefile.{dirs,install,examples} to install stuff.
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 08 Oct 2012 09:22:04 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 10 Oct 2012 08:42:38 +0200
 
 ocamlmakefile (6.36.0-2) unstable; urgency=low
 
diff --git a/debian/ocamlmakefile.dirs b/debian/ocamlmakefile.dirs
new file mode 100644
index 0000000..b5232a9
--- /dev/null
+++ b/debian/ocamlmakefile.dirs
@@ -0,0 +1,4 @@
+/usr/share/ocamlmakefile
+/usr/share/doc/ocamlmakefile/examples/calc
+/usr/share/doc/ocamlmakefile/examples/idl
+
diff --git a/debian/ocamlmakefile.examples b/debian/ocamlmakefile.examples
new file mode 100644
index 0000000..9566c42
--- /dev/null
+++ b/debian/ocamlmakefile.examples
@@ -0,0 +1 @@
+builddir/examples/*
diff --git a/debian/ocamlmakefile.install b/debian/ocamlmakefile.install
new file mode 100644
index 0000000..51ad34b
--- /dev/null
+++ b/debian/ocamlmakefile.install
@@ -0,0 +1 @@
+builddir/OCamlMakefile /usr/share/ocamlmakefile
diff --git a/debian/rules b/debian/rules
index c3a89fa..abf3a60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,44 +6,46 @@
 # top level dir for documentation
 export DOCDIR=debian/ocamlmakefile/usr/share/doc/ocamlmakefile
 
-# shared dir where files are to be installed
-export SHDIR=debian/ocamlmakefile/usr/share/ocamlmakefile
-
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
 
 build-stamp:
 	dh_testdir
+	mkdir -p builddir
+	mkdir -p builddir/examples
+	sed "s|/usr/local/lib|/usr/lib|" \
+		< OCamlMakefile > builddir/OCamlMakefile
+	for f in calc camlp4 idl gtk threads; do\
+	  cp -r $$f builddir/examples;\
+	  sed "s|../OCamlMakefile|/usr/share/ocamlmakefile/OCamlMakefile|"\
+		< $$f/Makefile\
+		> builddir/examples/$$f/Makefile;\
+	done
+	cp debian/README.examples.idl builddir/examples/calc/README
+	cp debian/README.examples.idl builddir/examples/idl/README
 
 clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
 	-rm build-stamp
+	-rm -r builddir
 
 install:
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installdirs
-	for f in calc camlp4 idl gtk threads; do\
-	  cp -r $$f $(DOCDIR)/examples;\
-	  sed "s|../OCamlMakefile|/usr/share/ocamlmakefile/OCamlMakefile|"\
-		< $$f/Makefile\
-		> $(DOCDIR)/examples/$$f/Makefile;\
-	done
-	cp debian/README.examples.idl $(DOCDIR)/examples/calc/README
-	cp debian/README.examples.idl $(DOCDIR)/examples/idl/README
-	sed "s|/usr/local/lib|/usr/lib|" < OCamlMakefile \
-		> $(SHDIR)/OCamlMakefile
 
 binary-arch: build install
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
+	dh_installdirs
+	dh_install
 	dh_installdocs
+	dh_installexamples
 	dh_installchangelogs CHANGES.txt
 	dh_compress
 	dh_fixperms

-- 
ocamlmakefile packaging