[Pkg-ocaml-maint-commits] r5592 - in /trunk/packages/why/trunk/debian: changelog patches/00list patches/configure.dpatch

[dogguy-guest at users.alioth.debian.org]

Author: dogguy-guest
Date: Mon May  5 16:58:50 2008
New Revision: 5592

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5592
Log:
Add configure.dpatch to correctly detect ocamlopt.


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

Modified: trunk/packages/why/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/changelog?rev=5592&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/changelog (original)
+++ trunk/packages/why/trunk/debian/changelog Mon May  5 16:58:50 2008
@@ -4,8 +4,9 @@
   * Update maintainer and uploders fields in debian/control.
   * Fix missing dependency (cpulimit).
   * Reinclude gwhy.sh
+  * Add configure.dpatch to correctly detect ocamlopt.
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 05 May 2008 10:47:33 +0200
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 05 May 2008 18:56:31 +0200
 
 why (2.11-1) unstable; urgency=low
 

Modified: trunk/packages/why/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/patches/00list?rev=5592&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/patches/00list (original)
+++ trunk/packages/why/trunk/debian/patches/00list Mon May  5 16:58:50 2008
@@ -1,1 +1,2 @@
+configure
 install

Added: trunk/packages/why/trunk/debian/patches/configure.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/patches/configure.dpatch?rev=5592&op=file
==============================================================================
--- trunk/packages/why/trunk/debian/patches/configure.dpatch (added)
+++ trunk/packages/why/trunk/debian/patches/configure.dpatch Mon May  5 16:58:50 2008
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## configure.dpatch by  <dogguy at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure	2008-03-17 10:21:43.000000000 +0100
++++ trunk/configure	2008-05-05 16:07:31.000000000 +0200
+@@ -1848,7 +1848,7 @@
+ fi
+ 
+ # checking for ocamlopt.opt
+-if test "$OCAMLOPT" != no ; then
++if test "$OCAMLOPT" = no ; then
+     # Extract the first word of "ocamlopt.opt", so it can be a program name with args.
+ set dummy ocamlopt.opt; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+diff -urNad trunk~/configure.in trunk/configure.in
+--- trunk~/configure.in	2008-03-17 10:21:43.000000000 +0100
++++ trunk/configure.in	2008-05-05 16:07:19.000000000 +0200
+@@ -142,7 +142,7 @@
+ fi
+ 
+ # checking for ocamlopt.opt
+-if test "$OCAMLOPT" != no ; then
++if test "$OCAMLOPT" = no ; then
+     AC_CHECK_PROG(OCAMLOPTDOTOPT,ocamlopt.opt,ocamlopt.opt,no)
+     if test "$OCAMLOPTDOTOPT" != no ; then
+ 	AC_MSG_CHECKING(ocamlc.opt version)

Propchange: trunk/packages/why/trunk/debian/patches/configure.dpatch
------------------------------------------------------------------------------
    svn:executable = *