[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.5-2-13-g5b221c3

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 976ba0b680c6deff6f7a18124296a0187afc547e
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 12 11:40:42 2013 +0200

    Switch packaging to dh 9

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f96c80a..9a4d148 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Guillaume Yziquel <guillaume.yziquel at citycable.ch>, 
            Mehdi Dogguy <mehdi at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: cdbs (>= 0.4.52),
- debhelper (>= 7),
+Build-Depends:
+ debhelper (>= 9),
  quilt,
  dh-ocaml (>= 0.9),
  ocaml-nox (>=3.11),
diff --git a/debian/libpgocaml-ocaml-dev.dirs.in b/debian/libpgocaml-ocaml-dev.dirs.in
deleted file mode 100644
index 2ce57fe..0000000
--- a/debian/libpgocaml-ocaml-dev.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlStdlibDir@/pgocaml/
diff --git a/debian/libpgocaml-ocaml-dev.install.in b/debian/libpgocaml-ocaml-dev.install.in
index 3ea9202..4f13ad4 100644
--- a/debian/libpgocaml-ocaml-dev.install.in
+++ b/debian/libpgocaml-ocaml-dev.install.in
@@ -1,7 +1,7 @@
-*.mli             @OCamlStdlibDir@/pgocaml
-OPT: *.a          @OCamlStdlibDir@/pgocaml
-OPT: *.cmx        @OCamlStdlibDir@/pgocaml
-OPT: *.cmxa       @OCamlStdlibDir@/pgocaml
-*.cmi             @OCamlStdlibDir@/pgocaml
-pa_pgsql.cmo      @OCamlStdlibDir@/pgocaml
-OPT: pgocaml_prof @OCamlStdlibDir@/pgocaml
+     @OCamlStdlibDir@/pgocaml/*.ml*
+OPT: @OCamlStdlibDir@/pgocaml/*.a
+OPT: @OCamlStdlibDir@/pgocaml/*.cmx
+OPT: @OCamlStdlibDir@/pgocaml/*.cmxa
+     @OCamlStdlibDir@/pgocaml/*.cmi
+     @OCamlStdlibDir@/pgocaml/pa_*
+     /usr/share/doc
diff --git a/debian/libpgocaml-ocaml.dirs.in b/debian/libpgocaml-ocaml.dirs.in
deleted file mode 100644
index 2ce57fe..0000000
--- a/debian/libpgocaml-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlStdlibDir@/pgocaml/
diff --git a/debian/libpgocaml-ocaml.install.in b/debian/libpgocaml-ocaml.install.in
index 0491271..a6d729d 100644
--- a/debian/libpgocaml-ocaml.install.in
+++ b/debian/libpgocaml-ocaml.install.in
@@ -1,3 +1,3 @@
-META          @OCamlStdlibDir@/pgocaml
-*.cma         @OCamlStdlibDir@/pgocaml
-OPT: *.cmxs   @OCamlStdlibDir@/pgocaml
+     @OCamlStdlibDir@/pgocaml/META
+     @OCamlStdlibDir@/pgocaml/pgocaml.cma
+OPT: @OCamlStdlibDir@/pgocaml/pgocaml.cmxs
diff --git a/debian/rules b/debian/rules
index 1c018df..4b4fdcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,48 +1,36 @@
 #!/usr/bin/make -f
-# debian/rules for pgocaml package
-# Copyright (C) 2009 Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-DEB_MAKE_CLEAN_TARGET   := clean
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET   := all USE_BATTERIES=yes
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=debian/libpgocaml-ocaml-dev/
-else
-DEB_MAKE_BUILD_TARGET   := all_byte USE_BATTERIES=yes
-DEB_MAKE_INSTALL_TARGET := install_byte DESTDIR=debian/libpgocaml-ocaml-dev/
-endif
-
-binary-install/libpgocaml-ocaml-dev::
-	rm -f debian/libpgocaml-ocaml-dev/$(OCAML_STDLIB_DIR)/pgocaml/META
-	rm -f debian/libpgocaml-ocaml-dev/$(OCAML_STDLIB_DIR)/pgocaml/pgocaml.cma
-	rm -f debian/libpgocaml-ocaml-dev/$(OCAML_STDLIB_DIR)/pgocaml/pgocaml_prof.cmi
-	rm -f debian/libpgocaml-ocaml-dev/$(OCAML_STDLIB_DIR)/pgocaml/pgocaml_prof.cmx
-
-pre-build::
-	make depend
-	if ! test -f pGOCaml_config.ml.orig; then \
-	  cp -f pGOCaml_config.ml pGOCaml_config.ml.orig; \
-	fi
-
-clean::
-	-$(RM) pgocaml.cmxs
-	-mv pGOCaml_config.ml.orig pGOCaml_config.ml
+
+include /usr/share/ocaml/ocamlvars.mk
+
+DESTDIR=$(CURDIR)/debian/tmp
+export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_LDCONF=ignore
+
+%:
+	dh $@ --with ocaml
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libpgocaml-ocaml-dev/html
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	ocaml setup.ml -build
+	ocaml setup.ml -doc
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+	ocaml setup.ml -test
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p '$(OCAMLFIND_DESTDIR)'
+	ocaml setup.ml -install
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocaml setup.ml -distclean
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing

-- 
pgocaml packaging