[Pkg-ocaml-maint-commits] [dose3] 02/02: builddebcheck: add option -o

Ralf Treinen treinen at moszumanska.debian.org
Sun Sep 14 19:13:43 UTC 2014


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

treinen pushed a commit to branch master
in repository dose3.

commit facecb49c64603bd8ba8f08a7b66b65fc878da26
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Sep 14 20:37:51 2014 +0200

    builddebcheck: add option -o
---
 debian/changelog                          |  6 +++--
 debian/patches/buildcheck-redirect-output | 40 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65756e6..2649675 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dose3 (3.2.2-3) UNRELEASED; urgency=medium
+dose3 (3.2.2-3) unstable; urgency=medium
 
   * debian/changelog: fix my email address in previous changelog entry.
   * add patch buildcheck-manpage-native-arch: specify in the manpage that
@@ -7,8 +7,10 @@ dose3 (3.2.2-3) UNRELEASED; urgency=medium
   * add patch multiarch-accept-value-no: when parsing debian metadata,
     accept "no" as alias for "none" as value of Multiarch. Thanks to
     Pietro Abate for the patch (closes: #759372).
+  * add patch buildcheck-redirect-output: add option -o to builddebcheck
+    which redirects output to a file (closes: #757643).
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 14 Sep 2014 19:51:14 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sun, 14 Sep 2014 20:36:02 +0200
 
 dose3 (3.2.2-2) unstable; urgency=medium
 
diff --git a/debian/patches/buildcheck-redirect-output b/debian/patches/buildcheck-redirect-output
new file mode 100644
index 0000000..49ee31d
--- /dev/null
+++ b/debian/patches/buildcheck-redirect-output
@@ -0,0 +1,40 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: add option -o to buildcheck (redirects output)
+Debian-bug: 757643
+Upstream-commit: 72dcb2efa9c8e9a5f127afd9b27fdbca4ce03a76
+
+Index: dose3/doc/manpages/buildcheck.pod
+===================================================================
+--- dose3.orig/doc/manpages/buildcheck.pod	2014-09-14 20:46:15.813165184 +0200
++++ dose3/doc/manpages/buildcheck.pod	2014-09-14 20:46:15.813165184 +0200
+@@ -96,6 +96,10 @@
+ 
+ Display this list of options. 
+ 
++=item B<-o> I<file>
++
++Send output to I<file>.
++
+ =back
+ =cut
+ 
+Index: dose3/applications/deb-buildcheck.ml
+===================================================================
+--- dose3.orig/applications/deb-buildcheck.ml	2014-09-14 20:46:00.000000000 +0200
++++ dose3/applications/deb-buildcheck.ml	2014-09-14 20:47:36.185164790 +0200
+@@ -64,8 +64,13 @@
+   Boilerplate.enable_timers (OptParse.Opt.get Options.timers) ["Solver"];
+   Util.Debug.disable "Depsolver_int";
+   Boilerplate.all_quiet (OptParse.Opt.get Options.quiet);
+-
+-  let fmt = Format.std_formatter in
++  let fmt =
++    if OptParse.Opt.is_set Options.outfile then
++      let oc = open_out (OptParse.Opt.get Options.outfile) in
++      Format.formatter_of_out_channel oc
++    else
++      Format.std_formatter
++  in
+   if OptParse.Opt.is_set Options.deb_native_arch then
+     Format.fprintf fmt "native-architecture: %s at ." (OptParse.Opt.get Options.deb_native_arch)
+   else
diff --git a/debian/patches/series b/debian/patches/series
index d3e447d..46d12c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ coinstall-binary-name
 buildcheck-manpage
 buildcheck-manpage-native-arch
 multiarch-accept-value-no
+buildcheck-redirect-output

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



More information about the Pkg-ocaml-maint-commits mailing list