[Pkg-ocaml-maint-commits] [atdgen] 14/16: Update packaging

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository atdgen.

commit 1cba630cf93dcac20d7669800d3a9f31e5893463
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jan 28 10:34:26 2016 +0100

    Update packaging
---
 debian/control                                     |  4 +---
 debian/libatdgen-ocaml-dev.doc-base.manual         | 11 ----------
 debian/libatdgen-ocaml-dev.docs                    |  3 ---
 debian/libatdgen-ocaml-dev.install.in              |  3 ++-
 debian/libatdgen-ocaml-dev.ocamldoc                |  1 -
 ...ix-installation-on-bytecode-architectures.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  7 +------
 8 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index 9df61bc..7264698 100644
--- a/debian/control
+++ b/debian/control
@@ -17,9 +17,7 @@ Build-Depends:
   libcaml2html-ocaml-dev,
   libbiniou-ocaml-dev (>= 1.0.6),
   libyojson-ocaml-dev,
-  libatd-ocaml-dev (>= 1.0.0),
-  hevea,
-  texlive-latex-extra
+  libatd-ocaml-dev (>= 1.0.0)
 Standards-Version: 3.9.5
 Homepage: http://mjambon.com/atdgen
 Vcs-Git: https://anonscm.debian.org/git/git/pkg-ocaml-maint/packages/atdgen.git
diff --git a/debian/libatdgen-ocaml-dev.doc-base.manual b/debian/libatdgen-ocaml-dev.doc-base.manual
deleted file mode 100644
index 8a50c3e..0000000
--- a/debian/libatdgen-ocaml-dev.doc-base.manual
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: libatdgen-ocaml-dev-manual
-Title: Atdgen reference manual
-Author: Martin Jambon
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libatdgen-ocaml-dev/atdgen-manual.html
-Files: /usr/share/doc/libatdgen-ocaml-dev/atdgen-manual.html
-
-Format: PDF
-Files: /usr/share/doc/libatdgen-ocaml-dev/atdgen-manual.pdf.gz
diff --git a/debian/libatdgen-ocaml-dev.docs b/debian/libatdgen-ocaml-dev.docs
index 80a00ef..b43bf86 100644
--- a/debian/libatdgen-ocaml-dev.docs
+++ b/debian/libatdgen-ocaml-dev.docs
@@ -1,4 +1 @@
 README.md
-manual/atdgen-manual.html
-manual/atdgen-manual.pdf
-api
diff --git a/debian/libatdgen-ocaml-dev.install.in b/debian/libatdgen-ocaml-dev.install.in
index 0db0b53..5b4beb8 100644
--- a/debian/libatdgen-ocaml-dev.install.in
+++ b/debian/libatdgen-ocaml-dev.install.in
@@ -5,4 +5,5 @@ OPT: @OCamlStdlibDir@/atdgen/*.o
 OPT: @OCamlStdlibDir@/atdgen/*.cmxa
 OPT: @OCamlStdlibDir@/atdgen/*.a
 OPT: @OCamlStdlibDir@/atdgen/*.cmx
-/usr/bin/atdgen
+OPT: /usr/bin/atdgen
+/usr/bin/atdgen.run
diff --git a/debian/libatdgen-ocaml-dev.ocamldoc b/debian/libatdgen-ocaml-dev.ocamldoc
deleted file mode 100644
index 5143b80..0000000
--- a/debian/libatdgen-ocaml-dev.ocamldoc
+++ /dev/null
@@ -1 +0,0 @@
--d api/html --doc-base-generate
diff --git a/debian/patches/0001-Fix-installation-on-bytecode-architectures.patch b/debian/patches/0001-Fix-installation-on-bytecode-architectures.patch
new file mode 100644
index 0000000..25a3724
--- /dev/null
+++ b/debian/patches/0001-Fix-installation-on-bytecode-architectures.patch
@@ -0,0 +1,24 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 28 Jan 2016 11:13:34 +0100
+Subject: Fix installation on bytecode architectures
+
+---
+ src/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index a067942..ed3c4c1 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -121,8 +121,8 @@ findlib-uninstall:
+ 
+ findlib-install: META
+ 	ocamlfind install atdgen META \
+-		 $(MLI) $(CMI) $(CMO) $(CMX) $(CMXS) $(O) \
+-			atdgen.cma atdgen.a atdgen.cmxa
++		 $(wildcard $(MLI) $(CMI) $(CMO) $(CMX) $(CMXS) $(O) \
++			atdgen.cma atdgen.a atdgen.cmxa)
+ 
+ .PHONY: install uninstall reinstall
+ uninstall: findlib-uninstall exe-uninstall
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5b5e1e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-installation-on-bytecode-architectures.patch
diff --git a/debian/rules b/debian/rules
index c89f326..b60392b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,14 +21,9 @@ export OCAMLFIND_LDCONF
 override_dh_auto_build:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	$(MAKE)
-	rm atdgen.run
 else
 	$(MAKE) all
-	mv atdgen.run atdgen
-endif 
-	$(MAKE) doc
-	mkdir api
-	mv odoc api/html
+endif
 
 
 .PHONY: override_dh_auto_install

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