[Pkg-shadow-devel] Re: [Pkg-shadow-commits] r229 - trunk/debian/patches

[Martin Quinson]

--J4XPiPrVK1ev6Sgr
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello, as both patches seem applied upstream (according to filename), I
prefered merging the patches to reduce the future headaches.

Bye, Mt.

On Thu, Jun 09, 2005 at 11:03:31PM +0000, Nicolas FRANCOIS wrote:
> Author: nekral-guest
> Date: 2005-06-09 23:03:30 +0000 (Thu, 09 Jun 2005)
> New Revision: 229
>=20
> Modified:
>    trunk/debian/patches/340_passwd.1
> Log:
> Reintroduce the typo, which is fixed later in 323.
>=20
>=20
> Modified: trunk/debian/patches/340_passwd.1
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debian/patches/340_passwd.1	2005-06-09 21:55:50 UTC (rev 228)
> +++ trunk/debian/patches/340_passwd.1	2005-06-09 23:03:30 UTC (rev 229)
> @@ -14,7 +14,7 @@
>  +The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the us=
er'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 t=
he
> -+information.  These two options are only meant for compatibility, since=
 the
> ++information.  These two options are only meant for compatiblity, 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.
>=20
>=20
> _______________________________________________
> Pkg-shadow-commits mailing list
> Pkg-shadow-commits@lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-shadow-commits

--J4XPiPrVK1ev6Sgr
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCqW8HIiC/MeFF8zQRAhVWAJ9S8DgwAVvSXO0PaN5wQx15AEnjJACePODl
SY6o2QCvfe34+73mGyawXmE=
=LmS/
-----END PGP SIGNATURE-----

--J4XPiPrVK1ev6Sgr--