[Pkg-ocaml-maint-commits] r2916 - in /trunk/packages/menhir/trunk/debian: changelog patches/00list patches/bashism.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Tue Jul 11 12:27:44 2006
New Revision: 2916

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2916
Log:
Remove bashisms.

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

Modified: trunk/packages/menhir/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/changelog?rev=2916&op=diff
==============================================================================
--- trunk/packages/menhir/trunk/debian/changelog (original)
+++ trunk/packages/menhir/trunk/debian/changelog Tue Jul 11 12:27:44 2006
@@ -1,3 +1,9 @@
+menhir (20060615.dfsg-2) UNRELEASED; urgency=low
+
+  * Added bashim.dpatch to remove bashisms, closes: #377803.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 11 Jul 2006 12:26:18 +0000
+
 menhir (20060615.dfsg-1) unstable; urgency=low
 
   * Repackaged upstream's tarball to remove manual.pdf for which we don't have

Modified: trunk/packages/menhir/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/patches/00list?rev=2916&op=diff
==============================================================================
--- trunk/packages/menhir/trunk/debian/patches/00list (original)
+++ trunk/packages/menhir/trunk/debian/patches/00list Tue Jul 11 12:27:44 2006
@@ -1,1 +1,2 @@
 manpage
+bashism

Added: trunk/packages/menhir/trunk/debian/patches/bashism.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/patches/bashism.dpatch?rev=2916&op=file
==============================================================================
--- trunk/packages/menhir/trunk/debian/patches/bashism.dpatch (added)
+++ trunk/packages/menhir/trunk/debian/patches/bashism.dpatch Tue Jul 11 12:27:44 2006
@@ -1,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bashism.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove bashisms.
+
+ at DPATCH@
+diff -urNad menhir-20060615.dfsg~/Makefile menhir-20060615.dfsg/Makefile
+--- menhir-20060615.dfsg~/Makefile	2006-06-15 07:26:06.000000000 +0000
++++ menhir-20060615.dfsg/Makefile	2006-07-11 12:24:59.000000000 +0000
+@@ -15,21 +15,21 @@
+ # Locating the ocaml compilers.
+ # If ocamlfind is available, then it is used for that purpose.
+ 
+-CAMLC           := $(shell if which ocamlfind &>/dev/null ; \
++CAMLC           := $(shell if which ocamlfind 2>&1 >/dev/null ; \
+                        then echo ocamlfind ocamlc ; \
+-		       elif which ocamlc.opt &>/dev/null ; \
++		       elif which ocamlc.opt 2>&1 >/dev/null ; \
+                        then echo ocamlc.opt ; \
+ 		       else echo ocamlc ; fi)
+ 
+-CAMLOPT         := $(shell if which ocamlfind &>/dev/null ; \
++CAMLOPT         := $(shell if which ocamlfind 2>&1 >/dev/null ; \
+                        then echo ocamlfind ocamlopt ; \
+-		       elif which ocamlopt.opt &>/dev/null ; \
++		       elif which ocamlopt.opt 2>&1 >/dev/null ; \
+                        then echo ocamlopt.opt ; \
+ 		       else echo ocamlopt ; fi)
+ 
+-CAMLDEP         := $(shell if which ocamlfind &>/dev/null ; \
++CAMLDEP         := $(shell if which ocamlfind 2>&1 >/dev/null ; \
+                        then echo ocamlfind ocamldep ; \
+-		       elif which ocamldep.opt &>/dev/null ; \
++		       elif which ocamldep.opt 2>&1 >/dev/null ; \
+                        then echo ocamldep.opt ; \
+ 		       else echo ocamldep ; fi)
+ 

Propchange: trunk/packages/menhir/trunk/debian/patches/bashism.dpatch
------------------------------------------------------------------------------
    svn:executable = *