[Pkg-shadow-commits] r234 - trunk/debian/patches

[Martin Quinson]

Author: mquinson
Date: 2005-06-10 10:42:42 +0000 (Fri, 10 Jun 2005)
New Revision: 234

Removed:
   trunk/debian/patches/323_passwd.1-typo.dpatch
Modified:
   trunk/debian/patches/314_passwd.1_formatting.dpatch
   trunk/debian/patches/340_passwd.1
   trunk/debian/patches/series
Log:
Merge 323_passwd.1-typo.dpatch [s/compatiblity/compatibility] into 340_passwd.1, and fixup 314_passwd.1_formatting.dpatch which touch the same file

Modified: trunk/debian/patches/314_passwd.1_formatting.dpatch
===================================================================
--- trunk/debian/patches/314_passwd.1_formatting.dpatch	2005-06-10 10:36:41 UTC (rev 233)
+++ trunk/debian/patches/314_passwd.1_formatting.dpatch	2005-06-10 10:42:42 UTC (rev 234)
@@ -35,7 +35,7 @@
  The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's shell.  The
 -\fB-f\fR option makes passwd call chfn to change the user's gecos
 +\fB-f\fR option makes \fBpasswd\fR call \fBchfn\fR to change the user's gecos
- information.  These two options are only meant for compatiblity, since the
+ information.  These two options are only meant for compatibility, since the
  other programs can be called directly.
  .SS Password Changes
 @@ -201,7 +201,7 @@ User account information

Deleted: trunk/debian/patches/323_passwd.1-typo.dpatch
===================================================================
--- trunk/debian/patches/323_passwd.1-typo.dpatch	2005-06-10 10:36:41 UTC (rev 233)
+++ trunk/debian/patches/323_passwd.1-typo.dpatch	2005-06-10 10:42:42 UTC (rev 234)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 323_passwd.1-typo.dpatch by Christian Perrier <bubulle@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct typo in passwd.1. Closes: #302740
-
-@DPATCH@
-Index: shadow-4.0.3/man/passwd.1
-===================================================================
---- shadow-4.0.3.orig/man/passwd.1	2005-05-12 21:58:56.126019802 +0200
-+++ shadow-4.0.3/man/passwd.1	2005-05-12 22:00:12.205652520 +0200
-@@ -47,7 +47,7 @@ of the user, user's login shell, or pass
- .PP
- The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's shell.  The
- \fB-f\fR option makes \fBpasswd\fR call \fBchfn\fR to change the user's gecos
--information.  These two options are only meant for compatiblity, since the
-+information.  These two options are only meant for compatibility, since the
- other programs can be called directly.
- .SS Password Changes
- The user is first prompted for his/her old password, if one is present.

Modified: trunk/debian/patches/340_passwd.1
===================================================================
--- trunk/debian/patches/340_passwd.1	2005-06-10 10:36:41 UTC (rev 233)
+++ trunk/debian/patches/340_passwd.1	2005-06-10 10:42:42 UTC (rev 234)
@@ -14,7 +14,7 @@
 +The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's shell.  The
  \fB-f\fR option makes passwd call chfn to change the user's gecos
 -information. These two options are only meant for compatiblity, since the
-+information.  These two options are only meant for compatiblity, since the
++information.  These two options are only meant for compatibility, since the
  other programs can be called directly.
  .SS Password Changes
  The user is first prompted for his/her old password, if one is present.

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-10 10:36:41 UTC (rev 233)
+++ trunk/debian/patches/series	2005-06-10 10:42:42 UTC (rev 234)
@@ -99,7 +99,6 @@
 319_time_structures.dpatch
 320_nscd_header.dpatch
 321_remove_malloc_definition.dpatch
-323_passwd.1-typo.dpatch
 324_configure.in-no-debian-dir.dpatch
 325_gshadow_5_manpage
 326_su.1_pwconv.8-typos