[Pkg-ocaml-maint-commits] [SCM] perl4caml packaging branch, master, updated. debian/0.9.3-8-9-g19afc82

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b21d4fd0db0f9425acfd6b0eb2e159463e498818
Author: Marc 'HE' Brockschmidt <he at debian.org>
Date:   Fri May 9 11:19:11 2008 +0200

    Imported Debian patch 0.9.3-8.1

diff --git a/debian/changelog b/debian/changelog
index 9e041e4..8bb06ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+perl4caml (0.9.3-8.1) unstable; urgency=low
+
+  * Non-maintainer upload to help perl5.10 transition along
+  * debian/patches/11_Makefile.config.dpatch: Added patch from Niko Tyni to
+    let perl4caml build against other perl version than 5.8.X. (Closes:
+    #466770)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org>  Fri, 09 May 2008 11:19:11 +0200
+
 perl4caml (0.9.3-8) unstable; urgency=low
 
   * Rebuild for 3.10.0
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/libperl4caml-ocaml-dev.files b/debian/libperl4caml-ocaml-dev.files
new file mode 100644
index 0000000..2922e9b
--- /dev/null
+++ b/debian/libperl4caml-ocaml-dev.files
@@ -0,0 +1 @@
+usr/lib/ocaml/3.10.0/perl/*
diff --git a/debian/libperl4caml-ocaml.files b/debian/libperl4caml-ocaml.files
new file mode 100644
index 0000000..2888ab0
--- /dev/null
+++ b/debian/libperl4caml-ocaml.files
@@ -0,0 +1 @@
+usr/lib/ocaml/3.10.0/stublibs/*
diff --git a/debian/patches/00list b/debian/patches/00list
index 137bae7..6f8f106 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 10_Makefile
+11_Makefile.config
diff --git a/debian/patches/10_Makefile.dpatch b/debian/patches/10_Makefile.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/11_Makefile.config.dpatch b/debian/patches/11_Makefile.config.dpatch
new file mode 100644
index 0000000..24c91a9
--- /dev/null
+++ b/debian/patches/11_Makefile.config.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_Makefile.config.dpatch by Marc Brockschmidt <he at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix up Makefile.config to not be bound to Perl5.8
+
+ at DPATCH@
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -36,7 +36,8 @@ EXTRA_CFLAGS := -DPERL4CAML_REFCOUNTING_EXPERIMENTAL=1
+ # To work out what this should be, try:
+ # `perl -MExtUtils::Embed -e ldopts'
+ 
+-DYNALOADER_HACK := /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a
++#DYNALOADER_HACK := /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a
++DYNALOADER_HACK := $(shell perl -MExtUtils::Embed -e 'print map { m{^(-l|/)} ? "-cclib $$_ " : "-ccopt $$_ "} split(/\s+/, ldopts(1))')
+ #DYNALOADER_HACK := /System/Library/Perl/5.8.1/darwin-thread-multi-2level/auto/DynaLoader/DynaLoader.a
+ 
+ # PACKAGE and VERSION

-- 
perl4caml packaging