[Pkg-ocaml-maint-commits] [SCM] ocaml-gnuplot packaging branch, master, updated. debian/0.8.3-2-2-g7b5ac9d

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 8fb46963520236dc2c302676178c00ea8759486b
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Mar 10 12:14:37 2012 +0100

    fix "make install" on non-native archs

diff --git a/debian/changelog b/debian/changelog
index 85076c7..a6cb709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml-gnuplot (0.8.3-3) unstable; urgency=low
+
+  * Patch install-byte: "make install" must depend only on the files that are
+    to be installed. Fixes FTBFS on archs without native ocaml compilation.
+    Thanks to Hendrik Tews for the hint (closes: #663172).
+  
+ -- Ralf Treinen <treinen at debian.org>  Sat, 10 Mar 2012 12:13:54 +0100
+
 ocaml-gnuplot (0.8.3-2) unstable; urgency=low
 
   * Fix licence in debian/copyright (GPL -> LGPL)
diff --git a/debian/patches/install-byte b/debian/patches/install-byte
new file mode 100644
index 0000000..514f7d6
--- /dev/null
+++ b/debian/patches/install-byte
@@ -0,0 +1,19 @@
+Author: Ralf Treinen <treinen at debian.org>
+Debian-bug: #663172
+Description: the install target must depend only on the files that are to be
+  installed and not on the "all" target, otherwise "make install" will fail
+  when ocaml does not compile to native code.
+
+Index: ocaml-gnuplot/Makefile
+===================================================================
+--- ocaml-gnuplot.orig/Makefile	2012-03-10 12:05:00.000000000 +0100
++++ ocaml-gnuplot/Makefile	2012-03-10 12:08:01.000000000 +0100
+@@ -72,7 +72,7 @@
+ 
+ # Installation
+ .PHONY: install
+-install: META all
++install: META $(INSTALL_FILES)
+ 	$(OCAMLFIND) install -destdir $(DESTDIR)/usr/lib/ocaml $(PKGNAME) META $(INSTALL_FILES)
+ 
+ uninstall:
diff --git a/debian/patches/series b/debian/patches/series
index 8cf3b09..5eb66a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 make_clean
 make_install
 demos_makefile
+install-byte

-- 
ocaml-gnuplot packaging