--- edos-debcheck-1.0.orig/debian/changelog +++ edos-debcheck-1.0/debian/changelog @@ -0,0 +1,107 @@ +edos-debcheck (1.0-9) unstable; urgency=low + + * Make this is a transitional package for transition to edos-distcheck. + As a consequence, this package is now architecture=all. + * Standards-version 3.8.2 (no change). + + -- Ralf Treinen Wed, 17 Jun 2009 20:27:43 +0200 + +edos-debcheck (1.0-8) unstable; urgency=low + + [ Stefano Zacchiroli ] + * add-sources.py: add support for specifying an alternative prefix for + dummy source packages + + [ Ralf Treinen ] + * Fix spelling in edos-debcheck manpage (closes: Bug#495393). + * Extend edos-builddebcheck manpage: explain difference to compilation + from scratch. + * Edos-builddebcheck: call add-sources with --prefix option. + * Make sure add-sources.py gets installed with mode 755 (closes: Bug#498113). + + -- Ralf Treinen Sun, 07 Sep 2008 17:09:06 +0200 + +edos-debcheck (1.0-7) unstable; urgency=low + + [ 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.8.0 (no change) + * Added edos-builddebcheck wrapper to check for satisfiability of + build-dependencies (closes: Bug#494600). This neccessitates a + Recommends: python-debian. + + [ 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 + * add contributed script debian/contrib/add-sources.py, used to mangle + Packages/Sources to detect unbuildable packages + + -- Ralf Treinen Fri, 15 Aug 2008 03:38:45 +0200 + +edos-debcheck (1.0-6) unstable; urgency=low + + * Build-dependency on ocaml >= 3.10 to force autobuilders to use the + right ocaml version. + + -- Ralf Treinen Wed, 05 Sep 2007 09:39:45 +0200 + +edos-debcheck (1.0-5) unstable; urgency=low + + * Upload to unstable. + + -- Ralf Treinen Thu, 30 Aug 2007 21:08:21 +0200 + +edos-debcheck (1.0-4) experimental; urgency=low + + * Rebuild against ocaml 3.10 + * Fix debian/watch + * Relax build-dependency to ocaml-nox (>= 3.07) + + -- Ralf Treinen Wed, 04 Jul 2007 20:24:16 +0200 + +edos-debcheck (1.0-3) unstable; urgency=low + + * Do not crash on version numbers that contain non-alphanumeric characters + (closes: Bug#428603). Patch by Julien Cristau - thanks! + + -- Ralf Treinen Wed, 13 Jun 2007 18:50:37 +0200 + +edos-debcheck (1.0-2) unstable; urgency=low + + * Add a debian/watch file. + * Patch 02tilde_in_version: allow tilde character in version numbers. Thanks + to Julien Cristau for the patch (closes: Bug#386646). + * Don't depend on ocaml-nox when compiling to native code. + * Better factorization of debian/rule (inspired by the approx package). + + -- Ralf Treinen Sat, 9 Sep 2006 20:47:39 +0200 + +edos-debcheck (1.0-1) unstable; urgency=low + + * New upstream release. + * Adapt patch 01Makefile to new upstream version. + + -- Ralf Treinen Thu, 6 Jul 2006 14:18:55 +0200 + +edos-debcheck (0.0.2006.03.19-2) unstable; urgency=low + + * Improved short and long description (closes: Bug#375209, Bug#375287) + * Don't code the ocaml version number into the build-dependency. + * Compile into bytecode on architectures where no native code compiler + is available (closes: Bug#376156) + + -- Ralf Treinen Mon, 3 Jul 2006 22:24:06 +0200 + +edos-debcheck (0.0.2006.03.19-1) unstable; urgency=low + + * Initial Release (closes: Bug#365087). + + -- Ralf Treinen Mon, 22 May 2006 22:47:52 +0200 + + --- edos-debcheck-1.0.orig/debian/svn-deblayout +++ edos-debcheck-1.0/debian/svn-deblayout @@ -0,0 +1 @@ +tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/edos-debcheck --- edos-debcheck-1.0.orig/debian/rules +++ edos-debcheck-1.0/debian/rules @@ -0,0 +1,39 @@ +#!/usr/bin/make -f +# debian/rules for debcheck + +# export DH_VERBOSE=1 + +build: buildstamp +buildstamp: + dh_testdir + touch buildstamp + +clean: + dh_testdir + dh_testroot + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_link + dh_compress + dh_strip + dh_shlibdeps + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: build install + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- edos-debcheck-1.0.orig/debian/watch +++ edos-debcheck-1.0/debian/watch @@ -0,0 +1,4 @@ +version=3 + +http://www.edos-project.org/xwiki/bin/view/Main/debcheck_home/index.html \ + http://www.edos-project.org/xwiki/bin/download/Main/debcheck_home/debrpmcheck-([\d\.]*)\.tar\.gz \ No newline at end of file --- edos-debcheck-1.0.orig/debian/copyright +++ edos-debcheck-1.0/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Ralf Treinen on +Mon Apr 17 20:19:35 UTC 2006 + +It was downloaded from +https://protactinium.pps.jussieu.fr:12345/svn/edos/users/vouillon + +Upstream Authors: +Jerome Vouillon +Stefano Zacchiroli +Ralf Treinen + +Copyright (C) 2005 Jerome Vouillon, 2008 Stefano Zachiroli, 2008 Ralf Treinen + +These programs are free software; you can redistribute them and/or +modify them under the terms of the GNU General Public License as +published by the Free Software Foundation. License, or (at your +option) any later version. + +These programs are distributed in the hope that they will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. On Debian +systems, the complete text of the GNU General Public License can be +found in the /usr/share/common-licenses/GPL file. --- edos-debcheck-1.0.orig/debian/edos-debcheck.1 +++ edos-debcheck-1.0/debian/edos-debcheck.1 @@ -0,0 +1,87 @@ +.TH EDOS-DEBCHECK 1 2006-05-20 EDOS + +.SH NAME +Edos-debcheck \- Check satisfiability of Debian package dependencies + +.SH SYNOPSIS +\fBedos-debcheck\fR [option] ... [package] ... + +.SH DESCRIPTION +.B edos-debcheck +reads from standard input a set of Debian package descriptions, each of which +is in the format of deb-control(5). For instance, the Packages files as found +on a Debian mirror server, or in the directory \fI/var/lib/apt/lists/\fR of a +Debian system, are suitable as input to \fBedos-debcheck\fR. + +Packages may appear with multiple versions +in this set. We say that a package is identified in this set by the pair +consisting of the +.I package name +and of the +.I package version\fR. + +A package (called goal) is called \fIinstallable\fR with respect to a set of +packages if there exists a subset of the packages that + - contains at most one version for each package name + - contains the goal package (in any version, or a specific version) + - all packages of the subset have their dependencies and conflicts satisfied +in this subset. + +Debcheck checks whether every package given as argument is installable with +respect to the input set of packages. Specific versions can be specified by +following the package name with the sign '=' and the version of the package +(for instance, 'xemacs21=21.4.17-1'). If no package name is given as argument +then all packages of the input set are checked for satisfiability. + +The constraint solving algorithm is complete, that is it finds a +solution whenever there exists one, even for multiple disjunctive +dependencies and deep package conflicts. This problem is +computationally infeasible in theory (that is, NP-complete), but can +in practice be solved very efficiently for Packages files occurring +actually in Debian. + +.SH OPTIONS +.TP +.B -check +Double-check the results +.TP +.B -explain +Explain the results +.TP +.B -rules +Print generated rules +.TP +.B -failures +Only show failures +.TP +.B -successes +Only show successes +.TP +.B -help, --help +Display this list of options + +.SH EXAMPLE +Check which packages in a particular distribution are not installable and why: + + edos-debcheck -failures -explain < Packages + +where Packages is the file pertaining to that distribution, as for instance +found in the directory \fI /var/lib/apt/lists\fR. + +Check whether version 21.4.17-1 of the xemacs21 package is installable in a +distribution described by the file Packages: + + edos-debcheck -explain xemacs=21.4.17-1 < Packages + + +.SH AUTHOR +Edos-debcheck has been written by Jerome Vouillon for the EDOS project. This +man-page has been compiled by Ralf Treinen. + +.SH SEE ALSO +.BR deb-control (5) + + is the home page of the EDOS project. + +.BR edos-rpmcheck (1) +is the analogous tool for rpm packages. --- edos-debcheck-1.0.orig/debian/compat +++ edos-debcheck-1.0/debian/compat @@ -0,0 +1 @@ +4 --- edos-debcheck-1.0.orig/debian/control +++ edos-debcheck-1.0/debian/control @@ -0,0 +1,25 @@ +Source: edos-debcheck +Section: devel +Priority: optional +Maintainer: Ralf Treinen +Uploaders: Stefano Zacchiroli +Standards-Version: 3.8.2 +Build-Depends: debhelper (>= 4.0) +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/ +Homepage: http://www.edos-project.org/xwiki/bin/view/Main/debcheck_home + +Package: edos-debcheck +Architecture: all +Depends: edos-distcheck (>= 1.4.2-2) +Description: Check package dependencies (transitional package) + This is a transitional package which can be safely removed, its only + purpose is to pull in the dependency on edos-distcheck + +Package: edos-rpmcheck +Architecture: all +Depends: edos-distcheck (>= 1.4.2-2) +Description: Check package dependencies (transitional package) + This is a transitional package which can be safely removed, its only + purpose is to pull in the dependency on edos-distcheck + --- edos-debcheck-1.0.orig/debian/edos-rpmcheck.1 +++ edos-debcheck-1.0/debian/edos-rpmcheck.1 @@ -0,0 +1,81 @@ +.TH EDOS-RPMCHECK 1 2006-05-20 EDOS + +.SH NAME +Edos-rpmcheck \- Check satisfiability of rpm package dependencies + +.SH SYNOPSIS +\fBedos-rpmcheck\fR [option] ... [package] ... + +.SH DESCRIPTION +.B edos-rpmcheck +reads from standard input a set of rpm package descriptions. Packages may +appear with multiple versions in this set. For instance, an uncompressed +\fIhdlist.cz\fR is suitable as input. + +We say that a package is identified +in this set by the pair consisting of the +.I package name +and of the +.I package version\fR. + +A package (called goal) is called \fIinstallable\fR with respect to a set of +packages if there exists a subset of the packages that + - contains at most one version for each package name + - contains the goal package (in any version, or a specific version) + - all packages of the subset have their dependencies and conflicts satisfied +in this subset. + +.B Edos-rpmcheck +checks whether every package given as argument is installable +with respect to the input set of packages. Specific versions can be specified +by following the package name with the sign '=' and the version of the package +(for instance, 'xemacs21=21.4.17-1'). If no package name is given as argument +then all packages of the input set are checked for satisfiability. + +The constraint solving algorithm is complete, that is it finds a solution +whenever there exists one, even for multiple disjunctive dependencies and deep +package conflicts. This problem is computationally infeasible in theory (that +is, NP-complete), but can in practice be solved very efficiently. + +.SH OPTIONS +.TP +.B -check +Double-check the results +.TP +.B -explain +Explain the results +.TP +.B -rules +Print generated rules +.TP +.B -failures +Only show failures +.TP +.B -successes +Only show successes +.TP +.B -help, --help +Display this list of options + +.SH EXAMPLE +Check which packages in a particular distribution are not installable and why: + + gunzip -c hdlist.cz | edos-rpmcheck -failures -explain + +where hdlist.cz is the file pertaining to that distribution. + +Check whether version 21.4.17-1 of the xemacs21 package is installable in a +distribution described by the file Packages: + + gunzip -c hdlist.cz | edos-rpmcheck -explain xemacs=21.4.17-1 + + +.SH AUTHOR +Edos-rpmcheck has been written by Jerome Vouillon fro the EDOS project. This +man-page has been compiled by Ralf Treinen. + +.SH SEE ALSO + is the home page of the EDOS project. + +.BR edos-debcheck (1) +is the analogous tool for debian packages. --- edos-debcheck-1.0.orig/debian/patches/03nonalphanumerics.dpatch +++ edos-debcheck-1.0/debian/patches/03nonalphanumerics.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03nonalphanumerics.dpatch by Ralf Treinen +## +## DP: Do not crash on version numbes containing non-alphanumeics. +## DP: Patch by Julien Cristau (thanks!) + +@DPATCH@ +diff -urNad trunk~/deb.ml trunk/deb.ml +--- trunk~/deb.ml 2006-07-02 18:39:30.000000000 +0200 ++++ trunk/deb.ml 2007-06-13 18:46:08.000000000 +0200 +@@ -144,7 +144,7 @@ + ("[ \t]+\\|\\(" ^ + String.concat "\\|" + [","; "|"; "("; ")"; "<<"; "<="; "="; ">="; ">>"; "<"; ">"; +- "[A-Za-z0-9.:_+~-]+"] ^ ++ "[A-Za-z0-9.:_+~\127-\255-]+"] ^ + "\\)") + + let rec next_token s p = +@@ -183,7 +183,7 @@ + | _ -> failwith (Format.sprintf "Bad relation '%s'" (cur s)) + in + next s; +- let version = split_version (cur s) in ++ let version = try split_version (cur s) with _ -> (0, "0", None) in + next s; + expect s ")"; + (name, Some (comp, version)) --- edos-debcheck-1.0.orig/debian/patches/00dpatch.conf +++ edos-debcheck-1.0/debian/patches/00dpatch.conf @@ -0,0 +1,2 @@ +conf_debianonly=1 +conf_origtargzpath=../tarballs --- edos-debcheck-1.0.orig/debian/patches/02tilde_in_version.dpatch +++ edos-debcheck-1.0/debian/patches/02tilde_in_version.dpatch @@ -0,0 +1,84 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02tilde_in_version.dpatch based on a patch by Julien Cristau +## +## +## DP: Allow the tilde character in version numbers + +@DPATCH@ +diff -urNad trunk~/deb.ml trunk/deb.ml +--- trunk~/deb.ml 2006-07-02 18:39:30.000000000 +0200 ++++ trunk/deb.ml 2006-09-09 20:32:55.000000000 +0200 +@@ -103,19 +103,19 @@ + let strict_version_re_1 = + Str.regexp + ("^\\(\\([0-9]+\\):\\)?" ^ +- "\\([0-9][A-Za-z0-9.:+-]*\\)" ^ +- "-\\([A-Za-z0-9.+]+\\)$") ++ "\\([0-9][A-Za-z0-9.:+~-]*\\)" ^ ++ "-\\([A-Za-z0-9.+~]+\\)$") + let strict_version_re_2 = + Str.regexp + ("^\\(\\([0-9]+\\):\\)?" ^ +- "\\([0-9][A-Za-z0-9.:+]*\\)\\( \\)?$") ++ "\\([0-9][A-Za-z0-9.:+~]*\\)\\( \\)?$") + (* Some upstream version do not start with a digit *) + let version_re_1 = + Str.regexp +- "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+-]+\\)-\\([A-Za-z0-9.+]+\\)$" ++ "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+~-]+\\)-\\([A-Za-z0-9.+~]+\\)$" + let version_re_2 = + Str.regexp +- "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+]+\\)\\( \\)?$" ++ "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+~]+\\)\\( \\)?$" + + let split_version s = + if not (Str.string_match strict_version_re_1 s 0 || +@@ -144,7 +144,7 @@ + ("[ \t]+\\|\\(" ^ + String.concat "\\|" + [","; "|"; "("; ")"; "<<"; "<="; "="; ">="; ">>"; "<"; ">"; +- "[A-Za-z0-9.:_+-]+"] ^ ++ "[A-Za-z0-9.:_+~-]+"] ^ + "\\)") + + let rec next_token s p = +@@ -344,7 +344,11 @@ + let is_num c = c >= '0' && c <= '9' + + let char_map = +- Array.init 256 (fun c -> if is_letter (Char.chr c) then c else c + 256) ++ Array.init 256 ++ (fun c -> ++ if Char.chr c = '~' then c - 256 else ++ if is_letter (Char.chr c) then c else ++ c + 256) + + let compare_ver_char c1 c2 = + compare (char_map.(Char.code c1)) (char_map.(Char.code c2)) +@@ -357,12 +361,20 @@ + while !p1 < l1 && !p2 < l2 && s1.[!p1] = s2.[!p2] do + incr p1; incr p2 + done; +- if !p1 = l1 then begin +- if !p2 = l2 then 0 else -1 +- end else if !p2 = l2 then +- 1 +- else +- compare_ver_char s1.[!p1] s2.[!p2] ++ if !p1 = l1 ++ then ++ if !p2 = l2 ++ then ++ 0 ++ else ++ if s2.[!p2] = '~' then 1 else -1 ++ else ++ if !p2 = l2 ++ then ++ if s1.[!p1] = '~' then -1 else 1 ++ else ++ compare_ver_char s1.[!p1] s2.[!p2] ++ + + let first_num s p l = + let p = ref p in --- edos-debcheck-1.0.orig/debian/patches/01Makefile.dpatch +++ edos-debcheck-1.0/debian/patches/01Makefile.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01Makefile.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add target fro byte code compilation + +@DPATCH@ +diff -urNad trunk~/Makefile trunk/Makefile +--- trunk~/Makefile 2006-07-02 18:41:29.000000000 +0200 ++++ trunk/Makefile 2006-07-05 18:32:53.000000000 +0200 +@@ -5,9 +5,13 @@ + + OBJS = util.cmx common.cmx solver.cmx + OPTLINKFLAGS=unix.cmxa str.cmxa ++BYTEOBJS=${OBJS:%.cmx=%.cmo} ++BYTELINKFLAGS=${OPTLINKFLAGS:%.cmxa=%.cma} + + all: debcheck rpmcheck + ++byte: debcheck.byte rpmcheck.byte ++ + rpmcheck: $(OBJS) rpm.cmx + $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ $(LINKFLAGS) + +@@ -17,6 +21,13 @@ + + ##### + ++rpmcheck.byte: $(BYTEOBJS) rpm.cmo ++ $(OCAMLC) -o $@ $(BYTELINKFLAGS) $^ $(LINKFLAGS) ++ ++debcheck.byte: $(BYTEOBJS) deb.cmo ++ $(OCAMLC) -o $@ $(BYTELINKFLAGS) $^ $(LINKFLAGS) ++ ++ + clean:: + find . -regex ".*\\.\(cm[oix]\|o\)" | xargs rm -f + +@@ -51,4 +62,4 @@ + $(OCAMLDEP) $(DEPFLAGS) $$i \ + > .depend + +-include .depend ++-include .depend --- edos-debcheck-1.0.orig/debian/patches/04quiet_option.dpatch +++ edos-debcheck-1.0/debian/patches/04quiet_option.dpatch @@ -0,0 +1,138 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04quiet_option.dpatch by Stefano Zacchiroli +## +## 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) + +@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@." +- (Unix.gettimeofday () -. st.time) st.count ++ if not !Util.quiet then ++ Format.eprintf "Parsing package file... %.1f seconds %6d packages@." ++ (Unix.gettimeofday () -. st.time) st.count + + (****) + +@@ -57,5 +58,6 @@ + + let stop_generate st = + Util.set_msg ""; +- Format.eprintf "Generating constraints... %.1f seconds@." ++ if not !Util.quiet then ++ Format.eprintf "Generating constraints... %.1f seconds@." + (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@." +-(Unix.gettimeofday () -. t); ++if not !Util.quiet then ++ Format.eprintf "Checking packages... %.1f seconds@." ++ (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@." +-(Unix.gettimeofday () -. t); ++if not !Util.quiet then ++ Format.eprintf "Checking packages... %.1f seconds@." ++ (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@." s +- | Some s' -> Format.eprintf "Warning (%s): %s@." s' s +- end; +- show_msg () ++ if not !quiet then begin ++ hide_msg (); ++ begin match !warn_loc with ++ None -> Format.eprintf "Warning: %s@." s ++ | Some s' -> Format.eprintf "Warning (%s): %s@." 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 --- edos-debcheck-1.0.orig/debian/patches/00list +++ edos-debcheck-1.0/debian/patches/00list @@ -0,0 +1,4 @@ +01Makefile +02tilde_in_version +03nonalphanumerics.dpatch +04quiet_option.dpatch