Merge lp://staging/~ahasenack/landscape-client/sysinfo-manpage-303274 into lp://staging/~landscape/landscape-client/trunk

Proposed by Andreas Hasenack
Status: Work in progress
Proposed branch: lp://staging/~ahasenack/landscape-client/sysinfo-manpage-303274
Merge into: lp://staging/~landscape/landscape-client/trunk
Diff against target: 165 lines (+139/-1)
4 files modified
debian/landscape-client.manpages (+3/-0)
debian/landscape-common.manpages (+1/-0)
debian/rules (+1/-1)
man/landscape-sysinfo.1 (+134/-0)
To merge this branch: bzr merge lp://staging/~ahasenack/landscape-client/sysinfo-manpage-303274
Reviewer Review Type Date Requested Status
Jamu Kakar (community) Needs Information
Landscape Pending
Review via email: mp+46944@code.staging.launchpad.net

Description of the change

This branch adds a manpage for landscape-sysinfo(1), originally written by Jonathan Marsden (https://launchpad.net/~jmarsden) and further changed by myself. It also changes the way the debian packaging installs the manpages by using a file called debian/<package>.manpages and listing the manpages inside it.

To post a comment you must log in.
Revision history for this message
Jamu Kakar (jkakar) wrote :

[1]

I was expecting a man/landscape-sysinfo.txt file, which would be the
source for a manpage generated by txt2man...?

[2]

+in that configuration file, under the section \fI[sysinfo]\fP, by replacing the hifen

s/hifen/hyphen/ please.

[3]

Nice work on the manpage contents!

review: Needs Information
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

[1]
I didn't create one, since I got the manpage from the bug ticket by a contributor. Do we need the .txt files or are they there just to create the manpage? If they just serve as a template for the manpage, I vote to delete them. I recall we had issues with txt2man in different distributions not working as we wanted and that being a blocker once upon a time for us to update the manpages.

[2]
fixed

[3]
er, fixed :)

314. By Andreas Hasenack

hyphen spelling

Revision history for this message
Jamu Kakar (jkakar) wrote :

Andreas:

I find the text files much easier to read and edit. Also, to answer
your question, they are just source files for txt2man to generate
manpages. Even though we had some problems, it seems like we don't
have them now, and it'd be nice to keep the writing/editing process
simple.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I tried txt2man in all distros. It generated broken manpages on dapper and hardy, basically escaping a control char that it shouldn't:
"\\fB--version\fP" should have been "\fB--version\fP", for example. As a result, the manpage looks like:

"""
(...)
OPTIONS
       \fB--version
              Show program’s version number and exit.

       \fB-h, --help
              Show this help message and exit.
(...)
"""

Unmerged revisions

314. By Andreas Hasenack

hyphen spelling

313. By Andreas Hasenack

Use package.manpages to install the manpages, and include the new sysinfo
manpage in the list.

312. By Andreas Hasenack

- use package name in header, without a version though
- correct markup for filenames

311. By Andreas Hasenack

A whole bunch of updates to the manpage.

310. By Andreas Hasenack

Added first draft of a manpage for landscape-sysinfo from Jonathan Marsden
(https://launchpad.net/~jmarsden).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: