[Pkg-shadow-commits] r199 - in trunk/debian: . patches

Christian Perrier pkg-shadow-devel@lists.alioth.debian.org
Wed, 08 Jun 2005 20:31:05 +0000


Author: bubulle
Date: 2005-06-08 20:31:04 +0000 (Wed, 08 Jun 2005)
New Revision: 199

Modified:
   trunk/debian/changelog
   trunk/debian/patches/325_gshadow_5_manpage
Log:
Add fixes for #312429 (already applied upstream)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-06-08 18:24:21 UTC (rev 198)
+++ trunk/debian/changelog	2005-06-08 20:31:04 UTC (rev 199)
@@ -6,6 +6,7 @@
   * Upstream bugs not fixed in upstream releases or CVS:
   * Upstream bugs already fixed in upstream releases or CVS:
     - Corrected typos in chfn.1. Closes: #312428
+    - Corrected typos in gshadow.5. Closes: #312429
   * Translation updates:
 
  -- Christian Perrier <bubulle@debian.org>  Wed,  8 Jun 2005 20:22:56 +0200

Modified: trunk/debian/patches/325_gshadow_5_manpage
===================================================================
--- trunk/debian/patches/325_gshadow_5_manpage	2005-06-08 18:24:21 UTC (rev 198)
+++ trunk/debian/patches/325_gshadow_5_manpage	2005-06-08 20:31:04 UTC (rev 199)
@@ -10,7 +10,7 @@
 Index: shadow-4.0.3/man/gshadow.5
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.3/man/gshadow.5	2005-06-04 11:32:42.000000000 +0200
++++ shadow-4.0.3/man/gshadow.5	2005-06-08 22:28:04.000000000 +0200
 @@ -0,0 +1,65 @@
 +.\"$Id: gshadow.5,v 1.2 2005/04/02 16:10:23 kloczek Exp $
 +.\" Copyright 2005, Nicolas FRANCOIS
@@ -45,7 +45,7 @@
 +.SH DESCRIPTION
 +.I gshadow
 +contains the shadowed information for group accounts.
-+It contains lines with the folowing colon\-separated fields:
++It contains lines with the following colon\-separated fields:
 +.IP "" .5i
 +Group name
 +.IP "" .5i
@@ -56,14 +56,14 @@
 +Comma\-separated list of group members.
 +.PP
 +The group name and password fields must be filled.
-+The encryped password consists of 13 characters from the 64\-character
++The encrypted password consists of 13 characters from the 64\-character
 +alphabet a thru z, A thru Z, 0 thru 9, \. and /.
 +Refer to \fBcrypt\fR(3) for details on how this string is interpreted.
 +If the password field contains some string that is not valid result
 +of \fBcrypt\fR(3), for instance ! or *, the user will not be able to use
 +a unix password to log in, subject to \fBpam\fR(7).
 +.PP
-+This information supercedes any password present in \fI/etc/group\fR.
++This information supersedes any password present in \fI/etc/group\fR.
 +.PP
 +This file must not be readable by regular users if password
 +security is to be maintained.
@@ -79,8 +79,8 @@
 +Nicolas FRANCOIS
 Index: shadow-4.0.3/man/gpasswd.1
 ===================================================================
---- shadow-4.0.3.orig/man/gpasswd.1	2005-06-04 11:31:51.000000000 +0200
-+++ shadow-4.0.3/man/gpasswd.1	2005-06-04 11:32:42.000000000 +0200
+--- shadow-4.0.3.orig/man/gpasswd.1	2005-06-08 20:10:00.000000000 +0200
++++ shadow-4.0.3/man/gpasswd.1	2005-06-08 22:27:34.000000000 +0200
 @@ -12,33 +12,30 @@
  .SH SYNOPSIS
  \fBgpasswd \fIgroup\fR
@@ -153,8 +153,8 @@
  Rafal Maszkowski <rzm@pdi.net>
 Index: shadow-4.0.3/man/newgrp.1
 ===================================================================
---- shadow-4.0.3.orig/man/newgrp.1	2005-06-04 11:32:36.000000000 +0200
-+++ shadow-4.0.3/man/newgrp.1	2005-06-04 11:32:42.000000000 +0200
+--- shadow-4.0.3.orig/man/newgrp.1	2005-06-08 20:18:44.000000000 +0200
++++ shadow-4.0.3/man/newgrp.1	2005-06-08 22:27:34.000000000 +0200
 @@ -31,9 +31,9 @@
  .br
  sg \- execute command as different group ID
@@ -214,8 +214,8 @@
  Julianne Frances Haugh <jockgrrl@ix.netcom.com>
 Index: shadow-4.0.3/man/Makefile.am
 ===================================================================
---- shadow-4.0.3.orig/man/Makefile.am	2005-06-04 11:34:30.000000000 +0200
-+++ shadow-4.0.3/man/Makefile.am	2005-06-04 11:35:39.000000000 +0200
+--- shadow-4.0.3.orig/man/Makefile.am	2005-06-08 20:10:00.000000000 +0200
++++ shadow-4.0.3/man/Makefile.am	2005-06-08 22:27:34.000000000 +0200
 @@ -36,6 +36,7 @@
  	pwunconv.8 \
  	sg.1 \