Added camlp4 coq build fix.

diff --git a/debian/changelog b/debian/changelog
index a52dcc139666567b43815ed4dbf2967d5da3338d..4012a8c687b7da6e4c4398d5b441798fcde2c1fc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml (3.08.0-2) unstable; urgency=low
+
+  * Applied patch adding some missing .cmx to enable coq 3.08 to build.
+
+ -- Sven Luther <luther@debian.org>  Wed, 21 Jul 2004 17:57:10 +0200
+
 ocaml (3.08.0-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/patches/00list b/debian/patches/00list
index e52ce90b9d908bc4157b38e4fa6fc9806779e9ea..bf8285f8f0bee6302ea56b283f21e6ec39996deb 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 versioned_libdir
 #objinfo
 #hppa
-#config_bignum
+camlp4-coq-fix
+

diff --git a/debian/patches/camlp4-coq-fix.dpatch b/debian/patches/camlp4-coq-fix.dpatch
new file mode 100644 (file)
index 0000000..5defb20
--- /dev/null
+++ b/debian/patches/camlp4-coq-fix.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh -e 
+## camlp4-coq-fix.dpatch by Hugo Herbelin <hugo.herbelin@inria.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makefiles, configure scripts and other build stuff adapted for
+## DP: debian package creation
+
+if [ $# -ne 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;   
+    *)
+       echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+       exit 1;;
+esac
+
+exit 0
+@DPATCH@
+diff -urN ocaml-3.08.0.orig/camlp4/lib/Makefile ocaml-3.08.0/camlp4/lib/Makefile
+--- ocaml-3.08.0.orig/camlp4/lib/Makefile      2004-07-09 17:09:46.000000000 +0200
++++ ocaml-3.08.0/camlp4/lib/Makefile   2004-07-21 18:00:43.180226344 +0200
+@@ -48,7 +48,7 @@
+       test -f $(TARGET:.cma=.cmxa) && $(MAKE) installopt LIBDIR="$(LIBDIR)" || true
+ 
+ installopt:
+-      for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) ; do \
++      for f in $(TARGET:.cma=.cmxa) *.cmx $(TARGET:.cma=.p.cmxa) ; do \
+               test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \
+       done
+       # Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A))