[Pkg-ocaml-maint-commits] [menhir] 03/03: install first into debian/tmp

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository menhir.

commit bcf494356d9341adfc8442d93b61d653fb40349e
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Jul 12 23:10:32 2017 +0200

    install first into debian/tmp
---
 debian/changelog           | 8 +++++++-
 debian/control             | 4 +++-
 debian/menhir-doc.docs     | 2 +-
 debian/menhir-doc.examples | 1 +
 debian/menhir.dirs         | 3 ---
 debian/menhir.examples     | 1 -
 debian/menhir.install.in   | 4 +++-
 debian/menhir.manpages     | 1 -
 debian/rules               | 7 +++++--
 9 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddbfe8e..9f75617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,18 @@ menhir (20170712-1) UNRELEASED; urgency=medium
   * new binary package menhir-doc, containing the manual in pdf
     (closes: #484497).
     - add debian/menhir-doc.docs.
+    - examples go now into the menhir-docs package.
+  * debian/rules:
+    - let upstream's makefile install into debian/tmp, then install stuff
+      into package directories with dh_*.
+    - use dh_missing --fail-missing
+  * drop debian/menhir.manpages, debian/menhir.dirs
   * drop debian/purify-tarball which is no longer needed.
   * drop upstream filtering from debian/gbp.conf
   * debian/tests/control: add dependency on @
   * Change section to ocaml
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 12 Jul 2017 22:17:10 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 12 Jul 2017 23:39:40 +0200
 
 menhir (20170607.dfsg-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index ba5d9ab..fb29398 100644
--- a/debian/control
+++ b/debian/control
@@ -58,4 +58,6 @@ Description: Documentation of the menhir parser generator for OCaml
  Menhir is a LR(1) parser generator for OCaml. It is mostly compatible
  with the standard ocamlyacc and has a number of enhancements.
  .
- This package contains the menhir manual as a pdf file. 
\ No newline at end of file
+ This package contains the menhir manual as a pdf file, and the collection
+ of menhir examples.
+ 
\ No newline at end of file
diff --git a/debian/menhir-doc.docs b/debian/menhir-doc.docs
index 70c68db..b716462 100644
--- a/debian/menhir-doc.docs
+++ b/debian/menhir-doc.docs
@@ -1 +1 @@
-manual.pdf
+debian/tmp/usr/share/doc/menhir/manual.pdf
diff --git a/debian/menhir-doc.examples b/debian/menhir-doc.examples
new file mode 100644
index 0000000..ce9b74e
--- /dev/null
+++ b/debian/menhir-doc.examples
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/menhir/demos/*
\ No newline at end of file
diff --git a/debian/menhir.dirs b/debian/menhir.dirs
deleted file mode 100644
index c7772b1..0000000
--- a/debian/menhir.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/menhir
-usr/share/doc/menhir
diff --git a/debian/menhir.examples b/debian/menhir.examples
deleted file mode 100644
index dde105a..0000000
--- a/debian/menhir.examples
+++ /dev/null
@@ -1 +0,0 @@
-demos/*
diff --git a/debian/menhir.install.in b/debian/menhir.install.in
index 3134cef..32d11e7 100644
--- a/debian/menhir.install.in
+++ b/debian/menhir.install.in
@@ -1 +1,3 @@
-src/standard.mly	usr/share/menhir
+debian/tmp/usr/bin		usr
+debian/tmp/usr/share/man	usr/share
+debian/tmp/usr/share/menhir	usr/share
diff --git a/debian/menhir.manpages b/debian/menhir.manpages
deleted file mode 100644
index b6aef3d..0000000
--- a/debian/menhir.manpages
+++ /dev/null
@@ -1 +0,0 @@
-menhir.1
diff --git a/debian/rules b/debian/rules
index 4f3043a..633af93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,8 @@ export DH_VERBOSE=1
 
 include /usr/share/ocaml/ocamlvars.mk
 
-DESTDIR := $(CURDIR)/debian/menhir
-export OCAMLFIND_DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+DESTDIR := $(CURDIR)/debian/tmp
+export OCAMLFIND_DESTDIR := $(DESTDIR)/$(OCAML_STDLIB_DIR)
 BEST := native
 ifneq ($(OCAML_BEST),opt)
 BEST = byte
@@ -23,6 +23,9 @@ override_dh_auto_install:
 	mkdir -p $(OCAMLFIND_DESTDIR)
 	$(MAKE) TARGET=$(BEST) PREFIX=$(DESTDIR)/usr install
 
+override_dh_missing:
+	dh_missing --fail-missing
+
 override_dh_auto_test:
 
 %:

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