Man pages cleanup:

- Unify author and copyright information formatting.

diff --git a/debian/changelog b/debian/changelog
index f76b642203c8f7922f4b2a90162cebdc97a2539e..c2f9ec8068101f106b702ff7b4dc92d8c20e3954 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ dpkg (1.14.6) UNRELEASED; urgency=low
     - Substitute 'FILES' header with 'SEE ALSO' in dpkg-buildpackage(1),
       and remove leftover string from man page split.
     - Split option descriptions so that it gets easier to distinguish.
+    - Unify author and copyright information formatting.
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).

diff --git a/man/ChangeLog b/man/ChangeLog
index 410a5b16ecc014c4fa311fd47827c0e9c999785a..483e9f8e83a3991f195279ab3e36c3ba4fd466ad 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-18  Guillem Jover  <guillem@debian.org>
+
+       * cleanup-info.8: Unify author and copyright information formatting.
+       * deb-substvars.5: Likewise.
+       * dpkg-checkbuilddeps.1: Likewise.
+       * dpkg-deb.1: Likewise.
+       * dpkg-divert.8: Likewise.
+       * dpkg-name.1: Likewise.
+       * dpkg-query.1: Likewise.
+       * dpkg-split.1: Likewise.
+       * dpkg-statoverride.8: Likewise.
+       * install-info.8: Likewise.
+       * update-alternatives.8: Likewise.
+
 2007-07-18  Guillem Jover  <guillem@debian.org>
 
        * dpkg.1: Split indeendent options.

diff --git a/man/cleanup-info.8 b/man/cleanup-info.8
index bc046f7cf91debdc45528dea05234c8560690119..88d37a0019fc65aaf3621337aae6ca904767de37 100644 (file)
--- a/man/cleanup-info.8
+++ b/man/cleanup-info.8
@@ -1,4 +1,4 @@
-.TH cleanup\-info 8 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH cleanup\-info 8 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 cleanup\-info \- clean up the mess that bogus install\-info may have done
 .
@@ -52,7 +52,7 @@ Probably many.
 .BR install\-info (8),
 .BR info (1).
 .SH AUTHOR
-Copyright (C) 1996 Kim-Minh Kaplan.
+Copyright (C) 1996 Kim-Minh Kaplan
 .sp
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO warranty.
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/deb-substvars.5 b/man/deb-substvars.5
index b28be0337eb78ba5f93b8d4d0135e19aef79e9b6..8558b3e97a4fafd65bc4e27117a55acd4cd4cf4d 100644 (file)
--- a/man/deb-substvars.5
+++ b/man/deb-substvars.5
@@ -1,5 +1,5 @@
 .\" Authors: Ian Jackson
-.TH deb\-substvars 5 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH deb\-substvars 5 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 deb\-substvars \- Debian source substitution variables
 .
@@ -134,12 +134,9 @@ standard output field settings is rather confused.
 .BR dpkg\-source (1).
 .
 .SH AUTHOR
-The utilities and this manpage were written by Ian Jackson.
-.
-.SH COPYRIGHT
 Copyright (C) 1995-1996 Ian Jackson
 .br
 Copyright (C) 2000 Wichert Akkerman
 .sp
-This is free software; see the GNU General Public Licence version 2 or later
-for copying conditions. There is NO WARRANTY.
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/dpkg-checkbuilddeps.1 b/man/dpkg-checkbuilddeps.1
index e72d116247f5ec33e069e8222db182a39716a856..b3f1c1bd9da4b2a824a7cec71db5817dbd9dc42e 100644 (file)
--- a/man/dpkg-checkbuilddeps.1
+++ b/man/dpkg-checkbuilddeps.1
@@ -1,4 +1,4 @@
-.TH dpkg\-checkbuilddeps 1 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-checkbuilddeps 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-checkbuilddeps \- check build dependencies and conflicts
 .
@@ -29,10 +29,10 @@ be built.
 Show the usage message and exit.
 .
 .SH AUTHOR
-Copyright 2001 Joey Hess
+Copyright (C) 2001 Joey Hess
 .UR mailto:joeyh@debian.org
-<joeyh@debian.org>.
+<joeyh@debian.org>
 .UE
 .sp
 This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is NO warranty.
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/dpkg-deb.1 b/man/dpkg-deb.1
index 0ad5bd221678a9f287285d84e15a2fa6520b8042..f8b238b34916323555f4f6ec79633dd7f804e664 100644 (file)
--- a/man/dpkg-deb.1
+++ b/man/dpkg-deb.1
@@ -1,4 +1,4 @@
-.TH dpkg\-deb 1 "2007-06-12" "Debian Project" "dpkg suite"
+.TH dpkg\-deb 1 "2007-07-18" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 .
@@ -242,11 +242,7 @@ package's scripts run and its status and contents recorded.
 .BR dselect (1).
 .
 .SH AUTHOR
-.B dpkg\-deb
-and this manpage were written by Ian Jackson.
-They are Copyright (C) 1995-1996 by him and released under the
-GNU General Public Licence version 2 or later; there is NO WARRANTY. See
-.I /usr/share/doc/dpkg/copyright
-and
-.I /usr/share/common\-licenses/GPL
-for details.
+Copyright (C) 1995-1996 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/dpkg-divert.8 b/man/dpkg-divert.8
index 382beca7aaffdf3f3e6872128fa984d6a573c606..2e9662ffb430fccb4bb5e841feba6403029640de 100644 (file)
--- a/man/dpkg-divert.8
+++ b/man/dpkg-divert.8
@@ -1,4 +1,4 @@
-.TH dpkg\-divert 8 "2007-08-18" "Debian Project" "dpkg utilities"
+.TH dpkg\-divert 8 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-divert \- override a package's version of a file
 .
@@ -119,7 +119,7 @@ Note: \fBdpkg\-divert\fP preserves the old copy of this file, with extension
 .BR dpkg (1).
 .
 .SH AUTHOR
-Copyright (C) 1995 Ian Jackson.
+Copyright (C) 1995 Ian Jackson
 .sp
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO warranty.
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/dpkg-name.1 b/man/dpkg-name.1
index 55951e2fade3f82c758fd40d90a67545165d7fa5..140baff88e789b016da4dcc8616c9550ad2e03d0 100644 (file)
--- a/man/dpkg-name.1
+++ b/man/dpkg-name.1
@@ -3,7 +3,7 @@
 .\"
 .\" This is free software; see the GNU General Public Licence version 2
 .\" or later for copying conditions.  There is NO warranty.
-.TH dpkg\-name 1 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH dpkg\-name 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-name \- rename Debian packages to full package names
 .
@@ -102,10 +102,8 @@ might depend on this naming structure.
 .BR find (1),
 .BR xargs (1).
 .
-.SH COPYRIGHT
-Copyright 1995,1996 Erick Branderhorst.
-.B dpkg\-name
-is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is
-.B no
-warranty.
+.SH AUTHOR
+Copyright 1995,1996 Erick Branderhorst
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/dpkg-query.1 b/man/dpkg-query.1
index 2801eab112d465a47ff2fd751c4e904b9f905979..e030d6237236d7c8f3f2bd6817c131964c1d2699 100644 (file)
--- a/man/dpkg-query.1
+++ b/man/dpkg-query.1
@@ -147,13 +147,13 @@ This setting influences the output of the \fB\-\-list\fP option by changing
 the width of its output.
 .
 .SH AUTHOR
-Copyright 2001 Wichert Akkerman
+Copyright (C) 2001 Wichert Akkerman
 .UR mailto:wakkerma@debian.org
 <wakkerma@debian.org>
 .UE
 .sp
 This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is NO warranty.
+later for copying conditions. There is NO WARRANTY.
 .
 .SH SEE ALSO
 .BR dpkg (1).

diff --git a/man/dpkg-split.1 b/man/dpkg-split.1
index 3c334ab45349ab399d5253107bb1bbd0ec307dd3..6065eb5a662789ebebd576a964804e878d019b49 100644 (file)
--- a/man/dpkg-split.1
+++ b/man/dpkg-split.1
@@ -1,5 +1,5 @@
 .\" Authors: Ian Jackson
-.TH dpkg\-split 1 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH dpkg\-split 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-split \- Debian package archive split/join tool
 .
@@ -230,12 +230,7 @@ filename format should not be relied upon.
 .BR dpkg (1).
 .
 .SH AUTHOR
-.B dpkg\-split
-and this manpage were written by Ian Jackson. They are
-Copyright (C) 1995-1996
-by him and released under the GNU General Public Licence version 2 or later;
-there is NO WARRANTY. See
-.I /usr/share/doc/dpkg/copyright
-and
-.I /usr/share/common\-licenses/GPL
-for details.
+Copyright (C) 1995-1996 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/dpkg-statoverride.8 b/man/dpkg-statoverride.8
index bfff30168079b0976608b755cf9c2df0191299cb..fb0502681c3058de071ff79949166c678b404fd8 100644 (file)
--- a/man/dpkg-statoverride.8
+++ b/man/dpkg-statoverride.8
@@ -1,4 +1,4 @@
-.TH dpkg\-statoverride 8 "2007-06-12" "Debian project" "dpkg utilities"
+.TH dpkg\-statoverride 8 "2007-07-18" "Debian project" "dpkg utilities"
 .SH NAME
 dpkg\-statoverride \- override ownership and mode of files
 .
@@ -79,10 +79,10 @@ extension "\-old", before replacing it with the new one.
 .BR dpkg (1).
 .
 .SH AUTHOR
-Copyright 2000 Wichert Akkerman
+Copyright (C) 2000 Wichert Akkerman
 .UR mailto:wakkerma@debian.org
 <wakkerma@debian.org>
 .UE
 .sp
 This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is NO warranty.
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/install-info.8 b/man/install-info.8
index 0b946a9aa0572b3a5e8270aa795ba055b0a261d2..c7a38fb826535f022450659056ca172da22d0ddb 100644 (file)
--- a/man/install-info.8
+++ b/man/install-info.8
@@ -2,7 +2,7 @@
 .\"
 .\" This is free software; see the GNU General Public Licence version 2
 .\" or later for copying conditions.  There is NO warranty.
-.TH install\-info 8 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH install\-info 8 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 install\-info \- create or update entry in Info dir file
 .
@@ -288,10 +288,8 @@ processing steps are shown.
 .BR emacs (1),
 .BR info (1),
 .BR gzip(1).
-.SH COPYRIGHT
-Copyright 1994, Ian Jackson.
-.B install\-info
-is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is
-.I no
-warranty.
+.SH AUTHOR
+Copyright 1994 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

diff --git a/man/update-alternatives.8 b/man/update-alternatives.8
index 1a69489fc73353ff445d02e1da1f39deb8d31057..a681ad3698798bedc1f08736dd498869bc05fef1 100644 (file)
--- a/man/update-alternatives.8
+++ b/man/update-alternatives.8
@@ -390,15 +390,15 @@ and this manual page, it is a bug,
 either in the implementation or the documentation; please report it.
 .
 .SH AUTHOR
-Debian update\-alternatives is copyright 1995
-Ian Jackson. It is free software; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO warranty.
+Copyright (C) 1995 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.
 .PP
-This manual page is copyright 1997/98 Charles Briscoe-Smith.
-This is free documentation; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO WARRANTY.
-.PP
-You can find the GNU GPL in /usr/share/common\-licenses/GPL on any Debian system.
+This manual page is copyright 1997,1998 Charles Briscoe-Smith.
+.sp
+This is free documentation; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.
 .
 .SH "SEE ALSO"
 .BR ln (1),