[Pkg-ocaml-maint-commits] [xmlm] 02/02: Change debian/rules to accommodate for build system change

[Johannes Schauer]

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

josch-guest pushed a commit to branch master
in repository xmlm.

commit db359e5046e8cdb3b1f36a528bcc19f85f63cd0f
Author: josch <j.schauer at email.de>
Date:   Tue Mar 25 00:23:36 2014 +0100

    Change debian/rules to accommodate for build system change
    
     - use ocamlbuild manually to generate binaries
     - build man page for xmltrip with help2man
     - README -> README.md
     - bump standards version to 3.9.5
     - install upstream CHANGES.md
---
 debian/changelog                  | 13 +++++++++++++
 debian/clean                      |  1 +
 debian/control                    |  5 +++--
 debian/libxmlm-ocaml-dev.docs     |  2 +-
 debian/libxmlm-ocaml-dev.manpages |  1 +
 debian/rules                      | 41 +++++++++++++++++++++++++--------------
 6 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cacf72e..1709a1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xmlm (1.2.0-1) UNRELEASED; urgency=medium
+
+  [ Johannes Schauer ]
+  * Team upload.
+  * Imported Upstream version 1.2.0
+  * Change debian/rules to accommodate for build system change
+  * build man page for xmltrip with help2man
+  * README -> README.md
+  * bump standards version to 3.9.5
+  * install upstream CHANGES.md
+
+ -- josch <j.schauer at email.de>  Tue, 25 Mar 2014 00:23:09 +0100
+
 xmlm (1.1.1-3) unstable; urgency=low
 
   * Team upload
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..aa36157
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+xmltrip.1
diff --git a/debian/control b/debian/control
index 4076f29..d6671cf 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,9 @@ Build-Depends:
  debhelper (>= 8),
  ocaml-nox (>= 4),
  ocaml-findlib (>= 1.4),
- dh-ocaml (>= 0.9)
-Standards-Version: 3.9.3
+ dh-ocaml (>= 0.9),
+ help2man
+Standards-Version: 3.9.5
 Homepage: http://erratique.ch/software/xmlm
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/xmlm.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/xmlm.git
diff --git a/debian/libxmlm-ocaml-dev.docs b/debian/libxmlm-ocaml-dev.docs
index f528701..291e900 100644
--- a/debian/libxmlm-ocaml-dev.docs
+++ b/debian/libxmlm-ocaml-dev.docs
@@ -1,2 +1,2 @@
-README
+README.md
 doc
diff --git a/debian/libxmlm-ocaml-dev.manpages b/debian/libxmlm-ocaml-dev.manpages
new file mode 100644
index 0000000..aa36157
--- /dev/null
+++ b/debian/libxmlm-ocaml-dev.manpages
@@ -0,0 +1 @@
+xmltrip.1
diff --git a/debian/rules b/debian/rules
index d9a63d0..47e07c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,32 +4,43 @@
 DESTDIR=$(CURDIR)/debian/tmp
 include /usr/share/ocaml/ocamlvars.mk
 OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
-export OCAMLFIND_DESTDIR
+
+libtarget = xmlm.cma
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	xmltrip = ./xmltrip.native
+	libtarget += xmlm.a xmlm.cmi xmlm.cmxa xmlm.cmx xmlm.cmxs
+else
+	xmltrip = ./xmltrip.byte
+endif
+libloc = $(addprefix ./_build/src/,$(libtarget))
 
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --enable-tests
-
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	ocaml setup.ml -build
+	ocamlbuild -classic-display $(libtarget) $(xmltrip)
+	help2man --no-info --version-string=1.2.0 \
+		--name "XML round trip: parses XML files and prints them" \
+		$(xmltrip) > xmltrip.1
 
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-	ocaml setup.ml -test
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocamlbuild -classic-display -clean
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	ocaml setup.ml -install
+	mkdir -p '$(OCAMLFIND_DESTDIR)/xmlm'
+	cp $(libloc) '$(OCAMLFIND_DESTDIR)/xmlm'
+	cp src/xmlm.mli '$(OCAMLFIND_DESTDIR)/xmlm'
+	cp pkg/META '$(OCAMLFIND_DESTDIR)/xmlm'
+	mkdir -p '$(DESTDIR)/usr/bin'
+	cp $(xmltrip) '$(DESTDIR)/usr/bin/xmltrip'
+
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.md
 
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --fail-missing
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	ocaml setup.ml -distclean

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