Bart Martens wrote:
> Back to the "time" package itself.  Is this your newest version of "time" you
> are requesting sponsorship for ? Or do you want to update it first ?
> http://www.proulx.com/~bob/debian/pool/sid/main/time/2012-06-22/time_1.7-24.dsc

It was.  But then Russ Allbery noted some oddities!  :-)  I have
addressed those issues with a new package turn.  Here is the latest
and greatest:

  
http://www.proulx.com/~bob/debian/pool/sid/main/time/2012-06-24/time_1.7-24.dsc
  
http://www.proulx.com/~bob/debian/pool/sid/main/time/2012-06-24/time_1.7-24_amd64.changes

I think it is ready to go.

To make the review easier I am attaching the diff with the incremental
changes between the 2012-06-22 and 2012-06-24 versions.

Thanks!
Bob
diff -ru 2012-06-22/debian/changelog 2012-06-24/debian/changelog
--- 2012-06-22/debian/changelog	2012-06-18 16:54:59.000000000 -0600
+++ 2012-06-24/debian/changelog	2012-06-24 20:36:53.000000000 -0600
@@ -6,20 +6,24 @@
     Bonaccorso.  (Closes: #592620)
   * Update to new standards version 3.9.3.
   * Update to new compat level 9.
-  * Use new DEP5 copyright file format.
-  * Convert package build system to debhelper dh.
-  * Convert package build to quilt 3.0.  Use DEP3 format for patch tagging.
+  * Use new machine readable copyright file format.
+  * Convert package build system to debhelper dh build system.
+  * Convert package build to "3.0 quilt".  Unwind diff.gz patches.  Use
+    DEP3 format for patch tagging.
   * Use dh_installinfo instead of install-info from postinst scripts.
     Thanks Riku Saikkonen, Hans Spaans.  (Closes: #617935, #598099)
   * ru_maxrss is reported in KBytes not pages.  Thanks Richard Kettlewell,
     Sven Hartrumpf, Miles Bader.  (Closes: #649402)
-  * Update bug report email address in README and info.  Thanks Faheem
-    Mitha.  (Closes: #542469)
+  * Update bug report email addresses.  Thanks Faheem Mitha.  (Closes: #542469)
   * Improve capitalization in short description.  Thanks Filipus
     Klutiero. (Closes: #492669)
   * Fix man page roff formatting.  Thanks Bjarni Ingi Gislason.
     (Closes: #663260)
-  
+  * Fix man page formatting oddities.  Thanks Russ Allbery for the nice patch.
+    See Bug#677013#68 for the discussion.
+  * Fix texinfo standalone info program navigation oddity.  Reported by
+    Russ Allbery.  See Bug#677013#63.
+
  -- Bob Proulx <b...@proulx.com>  Mon, 23 Feb 2012 12:55:30 -0700
 
 time (1.7-23.1) unstable; urgency=low
@@ -174,6 +178,8 @@
 
  -- Dirk Eddelbuettel <e...@debian.org>  Sat,  2 Oct 1999 16:00:28 -0400
 
+Old Changelog:
+
 time (1.7-4) unstable; urgency=low, Closes=31767
 
   * debian/{rules,postinst,postrm}: Removed support for html documentation
diff -ru 2012-06-22/debian/patches/series 2012-06-24/debian/patches/series
--- 2012-06-22/debian/patches/series	2012-06-18 16:34:59.000000000 -0600
+++ 2012-06-24/debian/patches/series	2012-06-24 20:12:36.000000000 -0600
@@ -1,7 +1,8 @@
-info-direntry.patch
 non-normal-exit.patch
-quiet.patch
-rusage-portability.patch
 ru_maxrss.patch
+rusage-portability.patch
+quiet.patch
 bug-address.patch
 configure.patch
+info-direntry.patch
+info-nav.patch
diff -ru 2012-06-22/debian/time.1 2012-06-24/debian/time.1
--- 2012-06-22/debian/time.1	2012-06-17 22:45:39.000000000 -0600
+++ 2012-06-24/debian/time.1	2012-06-23 16:37:03.000000000 -0600
@@ -2,10 +2,12 @@
 .\" Thanks to Herbert Thielen for a patch
 .\" Copyright (C) Dirk Eddelbuettel but freely redistributable
 .TH TIME 1 "Debian GNU/Linux"
+.\" Always turn off hyphenation; it makes way too many mistakes in
+.\" technical documents.
+.nh
 .SH NAME
 time \- run programs and summarize system resource usage
 .SH SYNOPSIS
-.hy 0
 .na
 .TP
 .B time
@@ -42,8 +44,9 @@
 [
 .I ARGS
 ]
-.hy 1
 .ad b
+.\" For nroff, turn off justification.
+.if n .ad l
 .SH DESCRIPTION
 .B time
 run the program
@@ -84,7 +87,6 @@
 .IR COMMAND .
 
 .SH OPTIONS
-.PD 0
 .TP
 .BI \-o " FILE, " \-\-output= "FILE "
 Write the resource use statistics to
@@ -96,7 +98,7 @@
 .TP
 .BR \-a ", " \-\-append ""
 Append the resource use information to the output file instead of overwriting
- it.  This option is only useful with the `\-o' or `\-\-output' option.
+it.  This option is only useful with the `\-o' or `\-\-output' option.
 .TP
 .BI \-f " FORMAT, " \-\-format " FORMAT "
 Use
@@ -168,6 +170,9 @@
 followed by that character, to indicate that an invalid resource
 specifier was given.
 
+.\" No blank line between the resource specifiers below so that they
+.\" are more compactly listed.
+.PD 0
 The resource specifiers, which are a superset of those recognized by the
 .BR tcsh (1)
 builtin `time' command, are:
--- 2012-06-22/time.texi
+++ 2012-06-24/time.texi
@@ -70,7 +70,10 @@
 by the Foundation.
 @end titlepage
 
-@node Top, , (dir), (dir)
+@contents
+
+@node Top
+@top The GNU @code{time} Command
 
 @ifinfo
 This file documents the the GNU @code{time} command for running programs
@@ -80,30 +83,12 @@
 
 @menu
 * Resource Measurement::  Measuring program resource use.
-
- --- The Detailed Node Listing ---
-
-Measuring Program Resource Use
-
-* Setting Format::      Selecting the information reported by @code{time}.
-* Format String::	The information @code{time} can report.
-* Redirecting::         Writing the information to a file.
-* Examples::		Examples of using @code{time}.
-* Accuracy::		Limitations on the accuracy of @code{time} output.
-* Invoking time::	Summary of the options to the @code{time} command.
-
-The Format String
-
-* Time Resources::
-* Memory Resources::
-* I/O Resources::
-* Command Info::
+* Concept index::  Index of concepts.
 @end menu
 
-@node Resource Measurement, , , Top
+@node Resource Measurement
 @chapter Measuring Program Resource Use
-@findex time
-@kindex time
+@cindex time invocation
 @pindex time
 @pindex measurement
 
@@ -125,7 +110,7 @@
 time @r{[}option@dots{}@r{]} @var{command} @r{[}@var{arg}@dots{}@r{]}
 @end example
 
-@kindex resources
+@cindex resource specifiers
 @code{time} runs the program @var{command}, with any given arguments
 @var{arg}@dots{}.  When @var{command} finishes, @code{time} displays
 information about resources used by @var{command}.
@@ -197,7 +182,7 @@
 
 @item -v
 @itemx --verbose
-@cindex format
+@cindex verbose format
 Use the built-in verbose format, which displays each available piece of
 information on the program's resource use on its own line, with an
 English description of its meaning.
@@ -207,7 +192,6 @@
 @section The Format String
 
 @cindex format
-@kindex resource
 The @dfn{format string} controls the contents of the @code{time} output.
 It consists of @dfn{resource specifiers} and @dfn{escapes}, interspersed
 with plain text.
@@ -450,7 +434,7 @@
 
 @node Accuracy
 @section Accuracy
-@kindex error (in measurement)
+@cindex error (in measurement)
 
 The elapsed time is not collected atomically with the execution of the
 program; as a result, in bizarre circumstances (if the @code{time}
@@ -489,7 +473,7 @@
 time @r{[}option@dots{}@r{]} @var{command} @r{[}@var{arg}@dots{}@r{]}
 @end example
 
-@kindex resources
+@cindex resources
 @code{time} runs the program @var{command}, with any given arguments
 @var{arg}@dots{}.  When @var{command} finishes, @code{time} displays
 information about resources used by @var{command} (on the standard error
@@ -524,7 +508,7 @@
 
 @item -v
 @itemx --verbose
-@cindex format
+@cindex verbose option
 Use the built-in verbose format.
 
 @item -V
@@ -533,5 +517,9 @@
 Print the version number of @code{time} and exit.
 @end table
 
-@contents
+@node Concept index
+@unnumbered Concept index
+
+@printindex cp
+
 @bye

Attachment: signature.asc
Description: Digital signature

Reply via email to