The following commit has been merged in the master branch:
commit dc3a97202521cd3529deafd82397e6133cadbdcb
Author: Stephane Glondu <st...@glondu.net>
Date:   Thu Jul 11 11:28:58 2013 +0200

    Put patches in dom-save-patches format

diff --git a/debian/patches/byte-code-compilation.patch 
b/debian/patches/0001-byte-compilation-rules-for-executables.patch
similarity index 71%
rename from debian/patches/byte-code-compilation.patch
rename to debian/patches/0001-byte-compilation-rules-for-executables.patch
index 1e5af35..f8d7efc 100644
--- a/debian/patches/byte-code-compilation.patch
+++ b/debian/patches/0001-byte-compilation-rules-for-executables.patch
@@ -1,8 +1,16 @@
-Description: byte compilation rules for executables
-Author: Hendrik Tews <hend...@askra.de>
+From: Hendrik Tews <hend...@askra.de>
+Date: Thu, 11 Jul 2013 11:26:59 +0200
+Subject: byte compilation rules for executables
+
+---
+ Makefile |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c38df65..a99ee70 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -56,11 +56,21 @@
+@@ -56,11 +56,21 @@ bdump$(EXE): $(SOURCES) bdump.ml
                -package $(PACKS) -linkpkg \
                biniou.cmxa bdump.ml
  
@@ -24,7 +32,7 @@ Author: Hendrik Tews <hend...@askra.de>
  doc: doc/index.html
  doc/index.html: $(MLI)
        mkdir -p doc
-@@ -71,7 +81,7 @@
+@@ -71,7 +81,7 @@ install: META
        test ! -f bdump.exe || cp bdump.exe $(BINDIR)/
        ocamlfind install biniou META \
            $$(ls $(MLI) $(CMI) $(CMO) $(CMX) $(O) \
@@ -33,3 +41,4 @@ Author: Hendrik Tews <hend...@askra.de>
  
  uninstall:
        test ! -f $(BINDIR)/bdump || rm $(BINDIR)/bdump
+-- 
diff --git a/debian/patches/fix-bi-stream-32.patch 
b/debian/patches/0002-fix-bi_stream-for-32-bit-OCaml.patch
similarity index 79%
rename from debian/patches/fix-bi-stream-32.patch
rename to debian/patches/0002-fix-bi_stream-for-32-bit-OCaml.patch
index c6f1b97..5a36dd1 100644
--- a/debian/patches/fix-bi-stream-32.patch
+++ b/debian/patches/0002-fix-bi_stream-for-32-bit-OCaml.patch
@@ -1,8 +1,17 @@
-Description: fix bi_stream for 32 bit OCaml
-Author: Hendrik Tews <hend...@askra.de>
+From: Hendrik Tews <hend...@askra.de>
+Date: Thu, 11 Jul 2013 11:27:17 +0200
+Subject: fix bi_stream for 32 bit OCaml
+
+---
+ bi_stream.ml  |   18 ++++++++++--------
+ bi_stream.mli |    8 +++++++-
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/bi_stream.ml b/bi_stream.ml
+index 03fba00..21f3f0c 100644
 --- a/bi_stream.ml
 +++ b/bi_stream.ml
-@@ -3,10 +3,10 @@
+@@ -3,10 +3,10 @@ open Printf
  let error s = failwith s
  
  let input_int64 ic =
@@ -16,7 +25,7 @@ Author: Hendrik Tews <hend...@askra.de>
        error "Corrupted stream: excessive chunk length"
    done;
    !n
-@@ -14,18 +14,20 @@
+@@ -14,18 +14,20 @@ let input_int64 ic =
  let output_int64 oc n =
    let n = ref n in
    for i = 1 to 8 do
@@ -41,7 +50,7 @@ Author: Hendrik Tews <hend...@askra.de>
          let s = String.create len in
          really_input ic s 0 len;
          Some (of_string s)
-@@ -85,7 +87,7 @@
+@@ -85,7 +87,7 @@ let write_stream ?(chunk_len = 1024) to_string oc st =
      n := 0;
      let s = to_string a in
      output_char oc '\001';
@@ -50,9 +59,11 @@ Author: Hendrik Tews <hend...@askra.de>
      output_string oc s
    in
    Stream.iter (
+diff --git a/bi_stream.mli b/bi_stream.mli
+index b2a8d02..631aa61 100644
 --- a/bi_stream.mli
 +++ b/bi_stream.mli
-@@ -20,7 +20,11 @@
+@@ -20,7 +20,11 @@ v}
  val read_stream : (string -> 'a array) -> in_channel -> 'a Stream.t
    (** [read_stream of_string ic] creates an OCaml stream from
        an input channel [ic]. The data come in chunks and each chunk
@@ -65,7 +76,7 @@ Author: Hendrik Tews <hend...@askra.de>
  
  val write_stream :
    ?chunk_len:int ->
-@@ -28,6 +32,8 @@
+@@ -28,6 +32,8 @@ val write_stream :
    (** [write_stream to_string oc st] writes an OCaml stream to the
        output channel [oc]. It creates chunks of [chunk_len],
        except for the last chunk which is usually smaller.
@@ -74,3 +85,4 @@ Author: Hendrik Tews <hend...@askra.de>
        @param chunk_len  has a default value of 1024.
    *)
  
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 1ac5dd2..98c0aed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-byte-code-compilation.patch
-fix-bi-stream-32.patch
+0001-byte-compilation-rules-for-executables.patch
+0002-fix-bi_stream-for-32-bit-OCaml.patch

-- 
biniou packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to