Package: git-buildpackage
Version: 0.4.22
Severity: minor
Tags: patch

Hello,

The subject says it all. The --upstream-version option is listed twice
in the synopsis section of git-import-orig's manpage. The first of the
attached patches removes the second of this options.

I have also attached another patch which I would like to see applied.
This one replaces the plain text references to other manpages  in the
SEE ALSO section of the form of "COMMAND (#SECTION)" with the
citerefentry element, see [1] for details. The advantage of using
citerefentry references over the plain text references is that the
former are formatted unitary to other manpages generated with
docbook2man and that for example if the manpages are viewed with
Konqueror, hyperlinks are used for these references - which is quite handy.

Thanks for considering,
Frank

[1] http://www.docbook.org/tdg/en/html/citerefentry.html

From 22cc2423c97d62eb56734a6e47d770eaa35f25de Mon Sep 17 00:00:00 2001
From: Frank S. Thomas <[EMAIL PROTECTED]>
Date: Mon, 24 Mar 2008 12:45:30 +0100
Subject: [PATCH] Do not list the --upstream-version option twice in the synopsis section of git-import-orig's manpage.

---
 docs/manpages/git-import-orig.sgml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index d1034eb..55c9ff7 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -27,7 +27,6 @@
       <arg><option>--no-dch</option></arg>
       <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
       <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
-      <arg><option>--upstream-version=</option><replaceable>version</replaceable></arg>
       <arg><option>--sign-tags</option></arg>
       <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
       <arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
-- 
1.5.4.4

From 5b325a39ac416dd065f23247fc6fa50bf6ad909f Mon Sep 17 00:00:00 2001
From: Frank S. Thomas <[EMAIL PROTECTED]>
Date: Mon, 24 Mar 2008 15:17:17 +0100
Subject: [PATCH] docs/manpages/*.sgml: Use the citerefentry for references to other manpages.

---
 docs/manpages/git-buildpackage.sgml |   23 ++++++++++++++++++++++-
 docs/manpages/git-dch.sgml          |   23 ++++++++++++++++++++++-
 docs/manpages/git-import-dsc.sgml   |   23 ++++++++++++++++++++++-
 docs/manpages/git-import-orig.sgml  |   23 ++++++++++++++++++++++-
 4 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index a0f14c1..c5a09c7 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -209,7 +209,28 @@
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>git-import-dsc (1), git-import-orig (1), debuild (1), git (1), git-dch (1)</para>
+    <para>
+      <citerefentry>
+        <refentrytitle>git-import-dsc</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-import-orig</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>debuild</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-dch</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>
+    </para>
 
   </refsect1>
   <refsect1>
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index b9aa16b..4828967 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -152,7 +152,28 @@
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>git-buildpackage (1), git-import-dsc (1), git-import-orig (1), git (1), git_load_dirs (1)</para>
+    <para>
+      <citerefentry>
+        <refentrytitle>git-buildpackage</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-import-dsc</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-import-orig</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git_load_dirs</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>
+    </para>
 
   </refsect1>
   <refsect1>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 6fb2cec..37556f0 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -121,7 +121,28 @@
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>git-buildpackage (1), git-import-orig (1), git (1), git_load_dirs (1), git-dch (1)</para>
+    <para>
+      <citerefentry>
+        <refentrytitle>git-buildpackage</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-import-orig</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git_load_dirs</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-dch</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>
+    </para>
   </refsect1>
   <refsect1>
     <title>AUTHOR</title>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 55c9ff7..66af13c 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -144,7 +144,28 @@
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>git-buildpackage (1), git-import-dsc (1), git (1), git_load_dirs (1), git-dch (1)</para>
+    <para>
+      <citerefentry>
+        <refentrytitle>git-buildpackage</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-import-dsc</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git_load_dirs</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>git-dch</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>
+    </para>
 
   </refsect1>
   <refsect1>
-- 
1.5.4.4

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to