[Pkg-ocaml-maint-commits] r3559 - in /trunk/packages/coq/branches/8.1/debian: changelog patches/00list patches/configure.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu Feb 15 14:02:39 2007
New Revision: 3559

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3559
Log:
Correctly detect the presence of ocamlopt.

Added:
    trunk/packages/coq/branches/8.1/debian/patches/configure.dpatch   (with props)
Modified:
    trunk/packages/coq/branches/8.1/debian/changelog
    trunk/packages/coq/branches/8.1/debian/patches/00list

Modified: trunk/packages/coq/branches/8.1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/changelog?rev=3559&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/changelog (original)
+++ trunk/packages/coq/branches/8.1/debian/changelog Thu Feb 15 14:02:39 2007
@@ -1,3 +1,10 @@
+coq (8.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Added configure.dpatch for the configure to correctly detect whether
+    ocamlopt is present or not.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 15 Feb 2007 13:00:45 +0000
+
 coq (8.1+dfsg-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/packages/coq/branches/8.1/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/patches/00list?rev=3559&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/patches/00list (original)
+++ trunk/packages/coq/branches/8.1/debian/patches/00list Thu Feb 15 14:02:39 2007
@@ -2,3 +2,4 @@
 browser
 makefile
 no-complexity-test
+configure

Added: trunk/packages/coq/branches/8.1/debian/patches/configure.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/patches/configure.dpatch?rev=3559&op=file
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/patches/configure.dpatch (added)
+++ trunk/packages/coq/branches/8.1/debian/patches/configure.dpatch Thu Feb 15 14:02:39 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## configure.dpatch by Pierre Letouzey <pierre.letouzey at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correctly detect whether ocamlopt is present or not.
+
+ at DPATCH@
+diff -urNad coq-8.1+dfsg~/configure coq-8.1+dfsg/configure
+--- coq-8.1+dfsg~/configure	2007-02-10 08:32:28.000000000 +0000
++++ coq-8.1+dfsg/configure	2007-02-15 12:58:56.000000000 +0000
+@@ -340,7 +340,7 @@
+ # do we have a native compiler: test of ocamlopt and its version
+ 
+ if [ "$best_compiler" = "opt" ] ; then
+-  if test -e `which "$nativecamlc"` ; then
++  if test -e "`which $nativecamlc`" ; then
+       CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
+       if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then
+ 	  echo "native and bytecode compilers do not have the same version!"; fi

Propchange: trunk/packages/coq/branches/8.1/debian/patches/configure.dpatch
------------------------------------------------------------------------------
    svn:executable = *