[Pkg-ocaml-maint-commits] [SCM] xml-light packaging branch, master, updated. debian/2.2-13-1-gd7df688

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit d7df688c2b03bd1dfb67dea5d947a47b8f0a94c1
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Jun 7 13:54:29 2012 +0200

    Do not try to install the .cmxs plugin unconditionally

diff --git a/debian/changelog b/debian/changelog
index 5ca4c33..a41672d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xml-light (2.2-14) UNRELEASED; urgency=low
+
+  * Do not try to install the .cmxs plugin on architectures where
+    natdynlink is not available.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 07 Jun 2012 13:51:49 +0200
+
 xml-light (2.2-13) unstable; urgency=low
 
   * Provide a .cmxs plugin in libxml-light-ocaml-dev (Closes: #647299).
@@ -38,7 +45,7 @@ xml-light (2.2-11) unstable; urgency=low
   * Remove useless doc/variable for generating debian/control from
     control.in
   * Use debian/clean
-  * Update debian/copyright using CopyrightFormat 
+  * Update debian/copyright using CopyrightFormat
   * Add Homepage field
 
  -- Sylvain Le Gall <gildor at debian.org>  Mon, 02 Mar 2009 22:54:48 +0100
diff --git a/debian/rules b/debian/rules
index 5d2e3f1..3cd5a50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,5 +47,10 @@ install/libxml-light-ocaml:: install/libxml-light-ocaml-dev
 	sed -i "s/@VERSION@/$$VERSION/g" '$(CURDIR)/debian/META.xml-light'
 
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light/xml-light.cma \
-	   $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light/xml-light.cmxs \
-	$(DESTDIR_RUN)/$(OCAML_STDLIB_DIR)/xml-light
+		$(DESTDIR_RUN)/$(OCAML_STDLIB_DIR)/xml-light
+ifeq ($(OCAML_NATDYNLINK),yes)
+	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light/xml-light.cmxs \
+		$(DESTDIR_RUN)/$(OCAML_STDLIB_DIR)/xml-light
+else
+	-$(RM) $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light/xml-light.cmxs
+endif

-- 
xml-light packaging