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

[Christian Perrier]

Author: bubulle
Date: 2006-05-04 17:46:47 +0000 (Thu, 04 May 2006)
New Revision: 969

Modified:
   trunk/debian/changelog
   trunk/debian/patches/402-clarify_usermod_usage
   trunk/debian/patches/series
Log:
Apply patch 402 to be clearer about -G and -A to be related


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-04 17:21:26 UTC (rev 968)
+++ trunk/debian/changelog	2006-05-04 17:46:47 UTC (rev 969)
@@ -9,6 +9,7 @@
       allowed in useradd(8).  Thanks to Reuben Thomas. Closes: #364909
   * Upstream bugs or fixes fixed in upstream releases or CVS:
     - 303_usermod_-a_in_man. Document -a in usermod man page. Closes: #365091
+    - 402-clarify_usermod_usage. Move -a close to -G. Closes: #363033
     - Programs translation updates or fixes:
       - 351_nl-359913: Fix typo in Dutch translation. Closes: #359913
       - 352_id-361186: Complete Indonesian translation. Closes: #361186, #361187

Modified: trunk/debian/patches/402-clarify_usermod_usage
===================================================================
--- trunk/debian/patches/402-clarify_usermod_usage	2006-05-04 17:21:26 UTC (rev 968)
+++ trunk/debian/patches/402-clarify_usermod_usage	2006-05-04 17:46:47 UTC (rev 969)
@@ -8,9 +8,9 @@
 
 Index: shadow-4.0.15/src/usermod.c
 ===================================================================
---- usermod.c.ori	2006-04-18 07:44:21.560344768 +0200
-+++ usermod.c	2006-04-18 07:48:02.849703672 +0200
-@@ -276,7 +276,6 @@
+--- shadow-4.0.15.orig/src/usermod.c	2006-05-04 19:44:57.799342864 +0200
++++ shadow-4.0.15/src/usermod.c	2006-05-04 19:45:41.498699552 +0200
+@@ -277,7 +277,6 @@
  	fprintf (stderr, _("Usage: usermod [options] login\n"
  			   "\n"
  			   "Options:\n"
@@ -18,7 +18,7 @@
  			   "  -c, --comment COMMENT		new value of the GECOS field\n"
  			   "  -d, --home HOME_DIR		new login directory for the new user account\n"
  			   "  -e, --expiredate EXPIRE_DATE	set account expiration date to EXPIRE_DATE\n"
-@@ -284,6 +283,9 @@
+@@ -285,6 +284,9 @@
  			   "				to INACTIVE\n"
  			   "  -g, --gid GROUP		force use GROUP as new initial login group\n"
  			   "  -G, --groups GROUPS		list of supplementary GROUPS\n"

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-05-04 17:21:26 UTC (rev 968)
+++ trunk/debian/patches/series	2006-05-04 17:46:47 UTC (rev 969)
@@ -45,3 +45,4 @@
 351_nl-359913
 352_id-361186
 353_hu-362749
+402-clarify_usermod_usage