[Pkg-ocaml-maint-commits] [SCM] omake packaging branch, master, updated. debian/0.9.8.5-3-4-18-g6503605

[Stephane Glondu]

The following commit has been merged in the master branch:
commit aca0da50a60638a807ace91b856d656dd47111a4
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Apr 11 16:03:32 2009 +0200

    Switch patch system to quilt

diff --git a/debian/control b/debian/control
index 6562743..783d254 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  libfam-dev,
  libreadline5-dev,
  libncurses5-dev,
- dpatch,
+ quilt,
  dh-ocaml
 Standards-Version: 3.7.2
 Homepage: http://omake.metaprl.org/
diff --git a/debian/patches/10_stdin_stdout_fix.dpatch b/debian/patches/0001-stdin-stdout-fix-upstream-r12115.patch
old mode 100755
new mode 100644
similarity index 55%
rename from debian/patches/10_stdin_stdout_fix.dpatch
rename to debian/patches/0001-stdin-stdout-fix-upstream-r12115.patch
index e2499e7..5a5416b
--- a/debian/patches/10_stdin_stdout_fix.dpatch
+++ b/debian/patches/0001-stdin-stdout-fix-upstream-r12115.patch
@@ -1,14 +1,17 @@
-#! /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)
+From fc3abe7e3395dfecd39a197fd3bf44682e03cba1 Mon Sep 17 00:00:00 2001
+From: Mike Furr <mfurr at debian.org>
+Date: Wed, 1 Apr 2009 23:50:52 +0200
+Subject: [PATCH] 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 @@
+---
+ src/build/omake_rule.ml |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/build/omake_rule.ml b/src/build/omake_rule.ml
+index 52fbf72..6792334 100644
+--- a/src/build/omake_rule.ml
++++ b/src/build/omake_rule.ml
+@@ -1040,12 +1040,12 @@ and eval_include_rule venv pos loc sources deps values commands =
   * Evaluate the commands NOW.
   *)
  and exec_commands venv pos loc commands =
@@ -24,3 +27,6 @@ diff -urNad omake-0.9.8.5~/src/build/omake_rule.ml omake-0.9.8.5/src/build/omake
              let status, _ = eval_shell_wait venv pos pid in
              let code =
                 match status with
+-- 
+1.6.2.1
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9439df6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_stdin_stdout_fix
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f868bc8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-stdin-stdout-fix-upstream-r12115.patch
diff --git a/debian/rules b/debian/rules
index e78aea6..57195dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 PACKAGE=omake
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 include /usr/share/ocaml/ocamlvars.mk
 
 build: build-stamp

-- 
omake packaging