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

[Christian Perrier]

Author: bubulle
Date: 2006-03-01 08:29:55 +0000 (Wed, 01 Mar 2006)
New Revision: 885

Added:
   trunk/debian/patches/303_passwd.1-synopsis
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Add passwd.1 synopsis fix patch (committed upstream)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-28 07:15:50 UTC (rev 884)
+++ trunk/debian/changelog	2006-03-01 08:29:55 UTC (rev 885)
@@ -8,6 +8,9 @@
       This is of no important with the Debian default common-* files
       but would lead to unexpected results if the local admin adds
       "sufficient" lines in these common-* files
+  * Upstream bugs fixed in upstream CVS:
+    - make passwd.1 synopsis consistent with other man pages
+      Closes: #352136
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 22 Feb 2006 20:29:52 +0100
 

Added: trunk/debian/patches/303_passwd.1-synopsis
===================================================================
--- trunk/debian/patches/303_passwd.1-synopsis	2006-02-28 07:15:50 UTC (rev 884)
+++ trunk/debian/patches/303_passwd.1-synopsis	2006-03-01 08:29:55 UTC (rev 885)
@@ -0,0 +1,35 @@
+Goal: Use of a consistent command synopsis for passwd.1
+
+Fixes: #352136
+
+Status wrt to upstream: Will be in 4.0.15
+
+Index: shadow-4.0.14/man/passwd.1.xml
+===================================================================
+--- shadow-4.0.14.orig/man/passwd.1.xml	2006-02-22 06:59:27.406418326 +0100
++++ shadow-4.0.14/man/passwd.1.xml	2006-02-28 18:43:39.510787920 +0100
+@@ -16,22 +16,9 @@
+   <refsynopsisdiv id='synopsis'>
+     <cmdsynopsis>
+       <command>passwd</command>
+-      <arg choice='opt'>-x <replaceable>max</replaceable></arg>
+-      <arg choice='opt'>-n <replaceable>min</replaceable></arg>
+-      <arg choice='opt'>-w <replaceable>warn</replaceable></arg>
+-      <arg choice='opt'>-i <replaceable>inact</replaceable></arg>
+-      <arg choice='plain'><replaceable>login</replaceable>
++      <arg choice='opt'>
++	<replaceable>options</replaceable>
+       </arg>
+-    </cmdsynopsis>
+-    <cmdsynopsis>
+-      <command>passwd</command>
+-      <group choice='opt'>
+-	<arg choice='plain'>-l </arg>
+-	<arg choice='plain'>-u </arg>
+-	<arg choice='plain'>-d </arg>
+-	<arg choice='plain'>-S </arg>
+-	<arg choice='plain'>-e </arg>
+-      </group>
+       <arg choice='plain'><replaceable>login</replaceable></arg>
+     </cmdsynopsis>
+   </refsynopsisdiv>

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-02-28 07:15:50 UTC (rev 884)
+++ trunk/debian/patches/series	2006-03-01 08:29:55 UTC (rev 885)
@@ -52,6 +52,7 @@
 491_configure.in_friendly_selinux_detection
 592_manpages_typos
 493_selinux_no_proc
+303_passwd.1-synopsis
 # 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