[Pkg-ocaml-maint-commits] r5849 - in /trunk/packages/edos-debcheck/trunk/debian: changelog control patches/00dpatch.conf patches/00list patches/04quiet_option.dpatch
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Tue Jul 15 14:39:04 UTC 2008
Author: zack
Date: Tue Jul 15 14:39:03 2008
New Revision: 5849
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5849
Log:
* Standards-Version 3.8.0 (no change)
* add myself as an Uploader
* debian/patches/
- add 00dpatch.conf to ease usage of dpatch-edit-patch
- 04quiet_option: new patch adding support for a -quiet command line
option, when given extra messages such as timing are suppressed
Added:
trunk/packages/edos-debcheck/trunk/debian/patches/00dpatch.conf
trunk/packages/edos-debcheck/trunk/debian/patches/04quiet_option.dpatch (with props)
Modified:
trunk/packages/edos-debcheck/trunk/debian/changelog
trunk/packages/edos-debcheck/trunk/debian/control
trunk/packages/edos-debcheck/trunk/debian/patches/00list
Modified: trunk/packages/edos-debcheck/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/changelog?rev=5849&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/changelog (original)
+++ trunk/packages/edos-debcheck/trunk/debian/changelog Tue Jul 15 14:39:03 2008
@@ -3,11 +3,16 @@
[ Ralf Treinen ]
* debian/control: add Homepage field
* fix spelling of Debian in package description, as suggested by
- Raphael Geissert (closes: Bug#480961).
- * Standards-Version 3.7.3 (no change)
+ Raphael Geissert (closes: Bug#480961).
+ * Standards-Version 3.8.0 (no change)
[ Stefano Zacchiroli ]
* fix vcs-svn field to point just above the debian/ dir
+ * add myself as an Uploader
+ * debian/patches/
+ - add 00dpatch.conf to ease usage of dpatch-edit-patch
+ - 04quiet_option: new patch adding support for a -quiet command line
+ option, when given extra messages such as timing are suppressed
-- Ralf Treinen <treinen at debian.org> Tue, 08 Jan 2008 09:04:21 +0100
Modified: trunk/packages/edos-debcheck/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/control?rev=5849&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/control (original)
+++ trunk/packages/edos-debcheck/trunk/debian/control Tue Jul 15 14:39:03 2008
@@ -2,7 +2,8 @@
Section: devel
Priority: optional
Maintainer: Ralf Treinen <treinen at debian.org>
-Standards-Version: 3.7.3
+Uploaders: Stefano Zacchiroli <zack at debian.org>
+Standards-Version: 3.8.0
Build-Depends: ocaml-nox (>= 3.10), debhelper (>= 4.0), dpatch
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/
Added: trunk/packages/edos-debcheck/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/00dpatch.conf?rev=5849&op=file
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/00dpatch.conf (added)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/00dpatch.conf Tue Jul 15 14:39:03 2008
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs
Modified: trunk/packages/edos-debcheck/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/00list?rev=5849&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/00list (original)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/00list Tue Jul 15 14:39:03 2008
@@ -1,3 +1,4 @@
01Makefile
02tilde_in_version
03nonalphanumerics.dpatch
+04quiet_option.dpatch
Added: trunk/packages/edos-debcheck/trunk/debian/patches/04quiet_option.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/04quiet_option.dpatch?rev=5849&op=file
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/04quiet_option.dpatch (added)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/04quiet_option.dpatch Tue Jul 15 14:39:03 2008
@@ -1,0 +1,138 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04quiet_option.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add support for a -quiet option which suppresses extra messages (timing,
+## DP: warnings, progress percentages)
+
+ at DPATCH@
+diff -urNad trunk~/common.ml trunk/common.ml
+--- trunk~/common.ml 2006-07-02 18:39:30.000000000 +0200
++++ trunk/common.ml 2008-07-15 16:35:22.711326075 +0200
+@@ -32,8 +32,9 @@
+
+ let stop_parsing st =
+ Util.set_msg "";
+- Format.eprintf "Parsing package file... %.1f seconds %6d packages at ."
+- (Unix.gettimeofday () -. st.time) st.count
++ if not !Util.quiet then
++ Format.eprintf "Parsing package file... %.1f seconds %6d packages at ."
++ (Unix.gettimeofday () -. st.time) st.count
+
+ (****)
+
+@@ -57,5 +58,6 @@
+
+ let stop_generate st =
+ Util.set_msg "";
+- Format.eprintf "Generating constraints... %.1f seconds at ."
++ if not !Util.quiet then
++ Format.eprintf "Generating constraints... %.1f seconds at ."
+ (Unix.gettimeofday () -. st.time);
+diff -urNad trunk~/deb.ml trunk/deb.ml
+--- trunk~/deb.ml 2008-07-15 16:32:58.252325215 +0200
++++ trunk/deb.ml 2008-07-15 16:33:28.439326474 +0200
+@@ -741,6 +741,8 @@
+ " Explain the results";
+ "-rules", Arg.Unit (fun () -> print_rules := true),
+ " Print generated rules";
++ "-quiet", Arg.Set Util.quiet,
++ "do not emit warnings nor progress/timing info";
+ "-failures",
+ Arg.Unit (fun () -> show_success := false),
+ " Only show failures";
+@@ -813,8 +815,9 @@
+ end
+ done;
+ Util.set_msg "";
+-Format.eprintf "Checking packages... %.1f seconds at ."
+-(Unix.gettimeofday () -. t);
++if not !Util.quiet then
++ Format.eprintf "Checking packages... %.1f seconds at ."
++ (Unix.gettimeofday () -. t);
+
+
+ (*
+diff -urNad trunk~/rpm.ml trunk/rpm.ml
+--- trunk~/rpm.ml 2006-07-02 18:39:30.000000000 +0200
++++ trunk/rpm.ml 2008-07-15 16:33:51.491355724 +0200
+@@ -885,6 +885,8 @@
+ "-rules", Arg.Unit (fun () -> print_rules := true),
+ " Print generated rules";
+ *)
++ "-quiet", Arg.Set Util.quiet,
++ "do not emit warnings nor progress/timing info";
+ "-failures",
+ Arg.Unit (fun () -> show_success := false),
+ " Only show failures";
+@@ -970,5 +972,6 @@
+ end
+ done;
+ Util.set_msg "";
+-Format.eprintf "Checking packages... %.1f seconds at ."
+-(Unix.gettimeofday () -. t);
++if not !Util.quiet then
++ Format.eprintf "Checking packages... %.1f seconds at ."
++ (Unix.gettimeofday () -. t);
+diff -urNad trunk~/util.ml trunk/util.ml
+--- trunk~/util.ml 2006-07-02 18:39:30.000000000 +0200
++++ trunk/util.ml 2008-07-15 16:32:58.432364246 +0200
+@@ -1,11 +1,12 @@
+
+ let enable_msgs = (* isatty is not available...*)
+ (Unix.fstat Unix.stderr).Unix.st_kind = Unix.S_CHR
++let quiet = ref false
+
+ let cur_msg = ref ""
+
+ let hide_msg () =
+- if !cur_msg <> "" then begin
++ if not !quiet && !cur_msg <> "" then begin
+ prerr_string "\r";
+ prerr_string (String.make (String.length !cur_msg) ' ');
+ prerr_string "\r";
+@@ -13,10 +14,11 @@
+ end
+
+ let show_msg () =
+- if !cur_msg <> "" then begin prerr_string !cur_msg; flush stderr end
++ if not !quiet && !cur_msg <> "" then
++ begin prerr_string !cur_msg; flush stderr end
+
+ let set_msg s =
+- if enable_msgs && s <> !cur_msg then begin
++ if enable_msgs && not !quiet && s <> !cur_msg then begin
+ hide_msg (); cur_msg := s; show_msg ()
+ end
+
+@@ -28,12 +30,14 @@
+ let reset_warning_location () = warn_loc := None
+
+ let print_warning s =
+- hide_msg ();
+- begin match !warn_loc with
+- None -> Format.eprintf "Warning: %s at ." s
+- | Some s' -> Format.eprintf "Warning (%s): %s at ." s' s
+- end;
+- show_msg ()
++ if not !quiet then begin
++ hide_msg ();
++ begin match !warn_loc with
++ None -> Format.eprintf "Warning: %s at ." s
++ | Some s' -> Format.eprintf "Warning (%s): %s at ." s' s
++ end;
++ show_msg ()
++ end
+
+ let fail s =
+ hide_msg ();
+diff -urNad trunk~/util.mli trunk/util.mli
+--- trunk~/util.mli 2006-07-02 18:39:30.000000000 +0200
++++ trunk/util.mli 2008-07-15 16:32:58.432364246 +0200
+@@ -6,5 +6,6 @@
+ val set_warning_location : string -> unit
+ val reset_warning_location : unit -> unit
+ val print_warning : string -> unit
++val quiet : bool ref
+
+ val fail : string -> 'a
Propchange: trunk/packages/edos-debcheck/trunk/debian/patches/04quiet_option.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-ocaml-maint-commits
mailing list