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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-05-22 18:56:49 +0000 (Sun, 22 May 2005)
New Revision: 163

Added:
   trunk/debian/patches/329_libmisc_failure_ngettext
Modified:
   trunk/debian/patches/006_libmisc.dpatch
   trunk/debian/patches/series
Log:
More bits separated from 006 (to 329).


Modified: trunk/debian/patches/006_libmisc.dpatch
===================================================================
--- trunk/debian/patches/006_libmisc.dpatch	2005-05-22 17:23:39 UTC (rev 162)
+++ trunk/debian/patches/006_libmisc.dpatch	2005-05-22 18:56:49 UTC (rev 163)
@@ -51,19 +51,6 @@
  
  #define	YEAR	(365L*DAY)
  
-@@ -235,9 +239,9 @@
- 	if (*lasttime == ' ')
- 		lasttime++;
- #endif
--	printf (_("%d %s since last login.  Last was %s on %s.\n"),
--		fail->fail_cnt, fail->fail_cnt > 1 ? _("failures"):_("failure"),
--		lasttime, fail->fail_line);
-+	printf (ngettext("%d failure since last login.  Last was %s on %s.\n",
-+		"%d failures since last login.  Last was %s on %s.\n",
-+		fail->fail_cnt), fail->fail_cnt, lasttime, fail->fail_line);
- }
- 
- /*
 @@ -248,7 +252,13 @@
   */
  

Added: trunk/debian/patches/329_libmisc_failure_ngettext
===================================================================
--- trunk/debian/patches/329_libmisc_failure_ngettext	2005-05-22 17:23:39 UTC (rev 162)
+++ trunk/debian/patches/329_libmisc_failure_ngettext	2005-05-22 18:56:49 UTC (rev 163)
@@ -0,0 +1,22 @@
+Goal: use ngettext for the failure count (Danilo Piazzalunga, 27 May 2004)
+Fixes: #251317
+
+Status wrt upstream: Upstream string is a little bit different, but uses ngettext.
+
+Index: shadow-4.0.3/libmisc/failure.c
+===================================================================
+--- shadow-4.0.3.orig/libmisc/failure.c	2005-05-20 01:04:14.000000000 +0200
++++ shadow-4.0.3/libmisc/failure.c	2005-05-22 20:49:21.137167000 +0200
+@@ -239,9 +239,9 @@
+ 	if (*lasttime == ' ')
+ 		lasttime++;
+ #endif
+-	printf (_("%d %s since last login.  Last was %s on %s.\n"),
+-		fail->fail_cnt, fail->fail_cnt > 1 ? _("failures"):_("failure"),
+-		lasttime, fail->fail_line);
++	printf (ngettext("%d failure since last login.  Last was %s on %s.\n",
++		"%d failures since last login.  Last was %s on %s.\n",
++		fail->fail_cnt), fail->fail_cnt, lasttime, fail->fail_line);
+ }
+ 
+ /*

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-05-22 17:23:39 UTC (rev 162)
+++ trunk/debian/patches/series	2005-05-22 18:56:49 UTC (rev 163)
@@ -65,6 +65,7 @@
 326_su.1_pwconv.8-typos
 327_newgrp_162303
 328_successful_password_change
+329_libmisc_failure_ngettext
 401_cppw_src.dpatch
 403_sg_symlink_162339_163652.dpatch
 404_undef_USE_PAM.dpatch