[Pkg-ocaml-maint-commits] r4399 - in /trunk/packages/omake/trunk/debian: changelog control patches/00list patches/10_stdin_stdout_fix.dpatch

[mfurr at users.alioth.debian.org]

Author: mfurr
Date: Fri Sep  7 21:07:15 2007
New Revision: 4399

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4399
Log:
3.10.0 transition

Added:
    trunk/packages/omake/trunk/debian/patches/10_stdin_stdout_fix.dpatch   (with props)
Modified:
    trunk/packages/omake/trunk/debian/changelog
    trunk/packages/omake/trunk/debian/control
    trunk/packages/omake/trunk/debian/patches/00list

Modified: trunk/packages/omake/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/changelog?rev=4399&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/changelog (original)
+++ trunk/packages/omake/trunk/debian/changelog Fri Sep  7 21:07:15 2007
@@ -1,3 +1,10 @@
+omake (0.9.8.5-3-2) unstable; urgency=low
+
+  * Update deps for 3.10.0 transitiion
+  * Apply patch from upstream svn to fix FTBFS (Closes: #439568)
+
+ -- Mike Furr <mfurr at debian.org>  Fri, 07 Sep 2007 17:06:51 -0400
+
 omake (0.9.8.5-3-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/omake/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/control?rev=4399&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/control (original)
+++ trunk/packages/omake/trunk/debian/control Fri Sep  7 21:07:15 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox (>= 3.09.2), libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox (>= 3.10.0), libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/omake
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/

Modified: trunk/packages/omake/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/patches/00list?rev=4399&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/patches/00list (original)
+++ trunk/packages/omake/trunk/debian/patches/00list Fri Sep  7 21:07:15 2007
@@ -1,0 +1,1 @@
+10_stdin_stdout_fix

Added: trunk/packages/omake/trunk/debian/patches/10_stdin_stdout_fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/patches/10_stdin_stdout_fix.dpatch?rev=4399&op=file
==============================================================================
--- trunk/packages/omake/trunk/debian/patches/10_stdin_stdout_fix.dpatch (added)
+++ trunk/packages/omake/trunk/debian/patches/10_stdin_stdout_fix.dpatch Fri Sep  7 21:07:15 2007
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_stdin_stdout_fix.dpatch by Mike Furr <mfurr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: stdin <-> stdout fix (upstream r12115)
+
+ at DPATCH@
+diff -urNad omake-0.9.8.5~/src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml
+--- omake-0.9.8.5~/src/build/omake_rule.ml	2007-07-02 14:20:23.000000000 -0400
++++ omake-0.9.8.5/src/build/omake_rule.ml	2007-09-06 12:52:23.752616976 -0400
+@@ -1040,12 +1040,12 @@
+  * Evaluate the commands NOW.
+  *)
+ and exec_commands venv pos loc commands =
+-   let stdin  = channel_of_var venv pos loc stdin_var in
+    let stdout = channel_of_var venv pos loc stdout_var in
+-   let stdin  = Lm_channel.descr stdin in
++   let stderr = channel_of_var venv pos loc stderr_var in
+    let stdout = Lm_channel.descr stdout in
++   let stderr = Lm_channel.descr stderr in
+       List.iter (fun command ->
+-            let pid = eval_shell_internal stdin stdout command in
++            let pid = eval_shell_internal stdout stderr command in
+             let status, _ = eval_shell_wait venv pos pid in
+             let code =
+                match status with

Propchange: trunk/packages/omake/trunk/debian/patches/10_stdin_stdout_fix.dpatch
------------------------------------------------------------------------------
    svn:executable = *