[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.3-1-2-ga507a4e

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit a507a4e70e3e9e1ecfdba0e4b91b617c5d81acc3
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Fri Oct 9 18:49:56 2009 +0200

    Build failure on non-native archs now fixed.

diff --git a/debian/changelog b/debian/changelog
index 5d13188..1c5eb64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pgocaml (1.3-2) UNRELEASED; urgency=low
     * Use CDBS rules (Closes: #549151)
     * Use dh_ocamldoc
     * Use depends/provides
+  * Non-ocamlopt archs excluded - yziquel (Closes: #541682)
 
  -- Sylvain Le Gall <gildor at debian.org>  Thu, 08 Oct 2009 22:20:12 +0000
 
diff --git a/debian/control b/debian/control
index 1362200..a262def 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ DM-Upload-Allowed: yes
 Build-Depends: cdbs (>= 0.4.52),
  debhelper (>= 7),
  dpatch,
- dh-ocaml,
+ dh-ocaml (>= 0.9),
  ocaml-nox (>=3.11),
  camlp4 (>=3.11),
  ocaml-findlib,
diff --git a/debian/patches/00list b/debian/patches/00list
index 41696e2..c3d9b96 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01_postgresql_socket
 02_makefile_mli
 03_makefile_cmxs
+04_makefile_byte
diff --git a/debian/patches/04_makefile_byte.dpatch b/debian/patches/04_makefile_byte.dpatch
new file mode 100755
index 0000000..0d1e501
--- /dev/null
+++ b/debian/patches/04_makefile_byte.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_makefile_byte.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
+##
+## DP: Compiling targets for non-native builds.
+
+ at DPATCH@
+diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
+--- pgocaml-1.3~/Makefile	2009-10-09 18:34:12.000000000 +0200
++++ pgocaml-1.3/Makefile	2009-10-09 18:36:26.000000000 +0200
+@@ -62,6 +62,7 @@
+ XOBJS	:= $(OBJS:.cmo=.cmx)
+ 
+ all: META pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pgocaml.cmxs pa_pgsql.cmo pgocaml_prof$(EXECUTABLE_SUFFIX)
++all_byte: META pGOCaml_config.ml pgocaml.cma pa_pgsql.cmo
+ 
+ test: test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) test_pgocaml$(EXECUTABLE_SUFFIX)
+ 
+@@ -165,6 +166,12 @@
+ 	install -c -m 0644 *.cmi *.mli *.cmo *.cma *.cmxa *.a META \
+ 	  $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
+ 
++install_byte:
++	rm -rf $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
++	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
++	install -c -m 0644 *.cmi *.mli *.cmo *.cma META \
++	  $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
++
+ #
+ # Distribution.
+ #
diff --git a/debian/rules b/debian/rules
index 9bf6c80..e8d2361 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,13 @@ include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
 DEB_MAKE_CLEAN_TARGET   := clean
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET   := all
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=debian/libpgocaml-ocaml-dev/
+else
+DEB_MAKE_BUILD_TARGET   := all_byte
+DEB_MAKE_INSTALL_TARGET := install_byte DESTDIR=debian/libpgocaml-ocaml-dev/
+endif
 
 pre-build::
 	make depend

-- 
pgocaml packaging