[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.1-5-3-g1c5e5e7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1c5e5e70926652e8a635dcceaee611690f77d7ac
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 29 16:13:10 2008 +0100

    Add natdynlink_support.dpatch

diff --git a/debian/changelog b/debian/changelog
index c32f710..c947013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 findlib (1.2.1-6) UNRELEASED; urgency=low
 
+  [ Stefano Zacchiroli ]
   * make Vcs-* fields point to the new git repository
 
- -- Stefano Zacchiroli <zack at debian.org>  Sat, 09 Aug 2008 10:18:53 -0300
+  [ Stephane Glondu ]
+  * Add natdynlink.dpatch, to add dynlink.cmxa to META.dynlink, if
+    available.
+
+ -- Stephane Glondu <steph at glondu.net>  Wed, 29 Oct 2008 16:16:03 +0100
 
 findlib (1.2.1-5) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 1f9c63a..2d979be 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
+natdynlink.dpatch
 stddirs.dpatch
 include.dpatch
 site_lib_metas.dpatch
diff --git a/debian/patches/natdynlink.dpatch b/debian/patches/natdynlink.dpatch
new file mode 100755
index 0000000..b8baed3
--- /dev/null
+++ b/debian/patches/natdynlink.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## natdynlink.dpatch by Stephane Glondu <steph at glondu.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add dynlink.cmxa to dynlink's META, if available
+
+ at DPATCH@
+diff --git a/configure b/configure
+index a130afc..6cfa060 100755
+--- a/configure
++++ b/configure
+@@ -427,6 +427,11 @@ for lib in $l; do
+     echo "Configuration for $lib written to site-lib-src/$lib/META"
+ done
+ 
++# Add native archive for dynlink if available
++if [ -f "$ocaml_core_stdlib/dynlink.cmxa" ]; then
++    echo 'archive(native) = "dynlink.cmxa"' >> site-lib-src/dynlink/META
++fi
++
+ for part in `cd src; echo *`; do
+     if [ -f "src/$part/META.in" ]; then
+ 	sed -e "s/@VERSION@/$version/g" src/$part/META.in >src/$part/META

-- 
findlib packaging