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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-11-30 22:55:05 +0000 (Wed, 30 Nov 2005)
New Revision: 667

Added:
   trunk/debian/patches/502_fix_generated_man_pages
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Replace the "?\226?\128?\153" by "'" to avoid the generation of "’"
I've found no other generated entities.
passwd.1 will be a little bit less nice, but who care?


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-30 22:01:06 UTC (rev 666)
+++ trunk/debian/changelog	2005-11-30 22:55:05 UTC (rev 667)
@@ -5,6 +5,10 @@
     - 468_duplicate_passwd_struct_before_usage
       Duplicate the passwd structures retrieved by getpwnam before calling
       PAM. Closes: #341230
+  * Debian specific fixes:
+    - 502_fix_generated_man_pages
+      remove the occurences of ’ which is not supported by the current version
+      of docbook-xsl in Debian. Closes: #341489
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 21 Nov 2005 20:33:40 +0100
 

Added: trunk/debian/patches/502_fix_generated_man_pages
===================================================================
--- trunk/debian/patches/502_fix_generated_man_pages	2005-11-30 22:01:06 UTC (rev 666)
+++ trunk/debian/patches/502_fix_generated_man_pages	2005-11-30 22:55:05 UTC (rev 667)
@@ -0,0 +1,34 @@
+Goal: Fix the man pages generation on Debian
+      The occurences "’" generated some "&#8217;"
+
+Fixes: #341489
+
+Status wrt upstream: Debian specific
+
+Note: this could probably be removed if docbook-xsl was updated (1.69.1
+      IIRC)
+
+Index: shadow-4.0.13/man/passwd.1.xml
+===================================================================
+--- shadow-4.0.13.orig/man/passwd.1.xml	2005-11-30 22:41:35.000000000 +0100
++++ shadow-4.0.13/man/passwd.1.xml	2005-11-30 23:35:13.000000000 +0100
+@@ -238,8 +238,8 @@
+ 	</term>
+ 	<listitem>
+ 	  <para>
+-	    Immediately expire an account’s password. This in effect can
+-	    force a user to change his/her password at the user’s next login.
++	    Immediately expire an account's password. This in effect can
++	    force a user to change his/her password at the user's next login.
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+@@ -324,7 +324,7 @@
+ 	<listitem>
+ 	  <para>
+ 	    Display account status information. The status information
+-	    consists of 7 fields. The first field is the user’s login name. 
++	    consists of 7 fields. The first field is the user's login name. 
+ 	    The second field indicates if the user account is locked (L),
+ 	    has no password (NP), or has a usable password (P). The third
+ 	    field gives the date of the last password change. The next four

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-11-30 22:01:06 UTC (rev 666)
+++ trunk/debian/patches/series	2005-11-30 22:55:05 UTC (rev 667)
@@ -69,6 +69,7 @@
 #End of holiday patches
 366_fflush-prompt
 468_duplicate_passwd_struct_before_usage
+502_fix_generated_man_pages
 # 999-2 is about using cdbs. It does not patch upstream files
 # so shouldn't be here, but we keep it for the future
 # 999-2_build_using_cdbs