[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.4.2-2-5-gb4bcdf8

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 33e0a46e1f883417ea4cabb927973d081f457232
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Feb 10 20:35:55 2011 +0100

    fix ftbfs on non-native archs (no *.cmxa files). priority=extra

diff --git a/debian/changelog b/debian/changelog
index 2e43d83..655ca6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dose2 (1.4.2-3) unstable; urgency=low
+
+  * Change priority to "extra" (closes: #612751).
+  * Install *.cmxa files only on native architectures (closes: #612749). 
+
+ -- Ralf Treinen <treinen at debian.org>  Thu, 10 Feb 2011 20:33:46 +0100
+
 dose2 (1.4.2-2) unstable; urgency=low
 
   * Make short descriptions of  libdose2-ocaml and  libdose2-ocaml-dev
diff --git a/debian/control b/debian/control
index b3e6d66..d2bd69e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: dose2
 Section: ocaml
-Priority: optional
+Priority: extra
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>,
  Ralf Treinen <treinen at debian.org>
diff --git a/debian/libdose2-ocaml-dev.install b/debian/libdose2-ocaml-dev.install
index 2a901f2..27edb0f 100644
--- a/debian/libdose2-ocaml-dev.install
+++ b/debian/libdose2-ocaml-dev.install
@@ -1,4 +1,3 @@
-*/*.cmxa	/usr/lib/ocaml/dose2
 */*.cma		/usr/lib/ocaml/dose2
 */*.a		/usr/lib/ocaml/dose2
 */*.cmi		/usr/lib/ocaml/dose2
diff --git a/debian/rules b/debian/rules
index b577480..10726f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,13 @@
 #!/usr/bin/make -f
 
+# do we have compilation of ocaml to native code?
+OPT = $(shell test -x /usr/bin/ocamlopt && echo true)
+
 %:
 	dh $@ --with ocaml
+
+override_dh_install:
+	dh_install
+ifeq ($(OPT),true)
+	dh_install */*.cmxa /usr/lib/ocaml/dose2
+endif
\ No newline at end of file

-- 
dose2 packaging