[Pkg-ocaml-maint-commits] [why] 04/08: adapt patches to new upstream

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository why.

commit 9314605f6bd4c348405b67a82b0d794a38e8fb3a
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Apr 22 20:45:48 2017 +0200

    adapt patches to new upstream
---
 debian/changelog                  |  5 +++-
 debian/patches/bprintf            |  6 ++---
 debian/patches/edge               |  6 ++---
 debian/patches/reproducible_build | 48 ++++++---------------------------------
 4 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec0986d..49c18ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 why (2.38-1) unstable; urgency=medium
 
   * New upstream version.
+    - refreshed patches bprintf, edge
+    - dropped hunks of patch reproducible_build that have been applied
+      by upstream.
 
- -- Ralf Treinen <treinen at debian.org>  Sat, 22 Apr 2017 20:29:51 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sat, 22 Apr 2017 20:45:03 +0200
 
 why (2.36-5) unstable; urgency=medium
 
diff --git a/debian/patches/bprintf b/debian/patches/bprintf
index 14ae4d9..62682ea 100644
--- a/debian/patches/bprintf
+++ b/debian/patches/bprintf
@@ -3,9 +3,9 @@ Description: Stop using deprecated function Format.bprintf
 
 Index: why/src/encoding_mono_inst.ml
 ===================================================================
---- why.orig/src/encoding_mono_inst.ml	2016-03-15 21:00:55.660268995 +0100
-+++ why/src/encoding_mono_inst.ml	2016-03-15 21:00:55.656268978 +0100
-@@ -140,7 +140,8 @@
+--- why.orig/src/encoding_mono_inst.ml	2017-04-22 20:31:28.757873905 +0200
++++ why/src/encoding_mono_inst.ml	2017-04-22 20:31:28.757873905 +0200
+@@ -139,7 +139,8 @@
      | PTexternal (l,id) -> fprintf fmt "%aI%a"
          (Pp.print_list (Pp.constant_string "I") aux) l Ident.print id in
    let b = Buffer.create 10 in
diff --git a/debian/patches/edge b/debian/patches/edge
index c5c8eb3..2293e1c 100644
--- a/debian/patches/edge
+++ b/debian/patches/edge
@@ -1,8 +1,8 @@
 Index: why/src/hypotheses_filtering.ml
 ===================================================================
---- why.orig/src/hypotheses_filtering.ml	2016-03-15 21:07:45.334803613 +0100
-+++ why/src/hypotheses_filtering.ml	2016-03-15 21:07:45.334803613 +0100
-@@ -1681,8 +1681,9 @@
+--- why.orig/src/hypotheses_filtering.ml	2017-04-22 20:32:34.418222231 +0200
++++ why/src/hypotheses_filtering.ml	2017-04-22 20:32:34.414222209 +0200
+@@ -1680,8 +1680,9 @@
  
  module W = struct 
    type label = PdlGraph.E.label
diff --git a/debian/patches/reproducible_build b/debian/patches/reproducible_build
index 989d199..f33de3f 100644
--- a/debian/patches/reproducible_build
+++ b/debian/patches/reproducible_build
@@ -1,11 +1,11 @@
 Author: Valentin Lorentz <progval at progval.net>
-Description: Remove extra timestamps
+	Description: Remove extra timestamps
 
 Index: why/src/whyweb.ml
 ===================================================================
---- why.orig/src/whyweb.ml	2016-10-06 20:36:29.418832407 +0200
-+++ why/src/whyweb.ml	2016-10-06 20:36:29.414832383 +0200
-@@ -137,10 +137,10 @@
+--- why.orig/src/whyweb.ml	2017-04-22 20:46:19.886615786 +0200
++++ why/src/whyweb.ml	2017-04-22 20:46:19.886615786 +0200
+@@ -136,10 +136,10 @@
  	   assert false)
       
  let version () = 
@@ -18,45 +18,11 @@ Index: why/src/whyweb.ml
    exit 0
  
  let port = ref 2372
-Index: why/java/java_options.ml
-===================================================================
---- why.orig/java/java_options.ml	2016-10-06 20:36:29.418832407 +0200
-+++ why/java/java_options.ml	2016-10-06 20:39:24.707792835 +0200
-@@ -107,10 +107,10 @@
- let files () = List.rev !files_
- 
- let version () =
--  Printf.printf "This is Krakatoa version %s, compiled on %s\
-+  Printf.printf "This is Krakatoa version %s\
- Copyright (c) 2006-2014 - Why development team - CNRS & INRIA & Univ Paris-Sud\
- This is free software with ABSOLUTELY NO WARRANTY (use option -warranty)\
--" Version.version Version.date;
-+" Version.version;
-   exit 0
- 
- let usage = "krakatoa [options] files"
-Index: why/jc/jc_options.ml
-===================================================================
---- why.orig/jc/jc_options.ml	2016-10-06 20:36:29.418832407 +0200
-+++ why/jc/jc_options.ml	2016-10-06 20:40:37.420178572 +0200
-@@ -115,10 +115,10 @@
- let pos_table = Hashtbl.create 97
- 
- let version () =
--  Printf.printf "This is Jessie version %s, compiled on %s\
-+  Printf.printf "This is Jessie version %s\
- Copyright (c) 2006-2014 - CNRS/INRIA/Univ Paris-Sud\
- This is free software with ABSOLUTELY NO WARRANTY (use option -warranty)\
--" Version.version Version.date;
-+" Version.version;
-   exit 0
- 
- let usage = "jessie [options] files"
 Index: why/src/options.ml
 ===================================================================
---- why.orig/src/options.ml	2016-10-06 20:36:29.418832407 +0200
-+++ why/src/options.ml	2016-10-06 20:45:49.573775520 +0200
-@@ -199,10 +199,10 @@
+--- why.orig/src/options.ml	2017-04-22 20:46:19.886615786 +0200
++++ why/src/options.ml	2017-04-22 20:46:19.886615786 +0200
+@@ -198,10 +198,10 @@
  
  let banner () =
    eprintf "\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/why.git