[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.4-1-1-g57a5cc4

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 57a5cc4aa9e6eceffa29612a5ea744858e4371df
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Jun 4 11:11:59 2011 +0200

    install algo.{o,a} only when they exist

diff --git a/debian/changelog b/debian/changelog
index 6f77498..b5cbd0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dose3 (2.9.4-2) experimental; urgency=low
+
+  * Attempt to install algo.{a,o} only when they exist. This should fix
+    compilation of the package on non-native architectures.
+    (closes: #627283)
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 04 Jun 2011 10:39:54 +0200
+
 dose3 (2.9.4-1) experimental; urgency=low
 
   * New upstream release. This release solves an issue with spuriously
diff --git a/debian/rules b/debian/rules
index e05c8b6..2bf10e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,9 @@ override_dh_auto_install:
 		&& mv distcheck dose3-distcheck \
 		&& mv deb-buildcheck dose3-builddebcheck
 # this should be fixed upstream:
-	cp _build/algo/algo.o _build/algo/algo.a \
-		debian/tmp/usr/lib/ocaml/dose3
+	for d in _build/algo/algo.o _build/algo/algo.a; do \
+	    if [ -f $$d ]; then cp $$d debian/tmp/usr/lib/ocaml/dose3; fi;\
+	done
 
 override_dh_installman:
 	dh_installman

-- 
dose3 packaging