[Pkg-shadow-commits] r3731 - in upstream/trunk: . man man/da man/de man/fr man/it man/pl man/ru man/sv man/zh_CN
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sun May 20 10:18:34 UTC 2012
Author: nekral-guest
Date: 2012-05-20 10:18:33 +0000 (Sun, 20 May 2012)
New Revision: 3731
Modified:
upstream/trunk/ChangeLog
upstream/trunk/NEWS
upstream/trunk/man/Makefile.am
upstream/trunk/man/da/Makefile.am
upstream/trunk/man/de/Makefile.am
upstream/trunk/man/fr/Makefile.am
upstream/trunk/man/generate_mans.mak
upstream/trunk/man/it/Makefile.am
upstream/trunk/man/pl/Makefile.am
upstream/trunk/man/ru/Makefile.am
upstream/trunk/man/sv/Makefile.am
upstream/trunk/man/zh_CN/Makefile.am
Log:
* NEWS, man/generate_mans.mak: Generate manpages in man1, man3,
man5, man8 subdirectories. This fix the generation of .so links
which did not point to a path relative to the top-level manual
hierarchy.
* man/generate_mans.mak: Update man paths accordingly.
* man/Makefile.am: Likewise.
* man/da/Makefile.am: Likewise.
* man/de/Makefile.am: Likewise.
* man/fr/Makefile.am: Likewise.
* man/it/Makefile.am: Likewise.
* man/pl/Makefile.am: Likewise.
* man/ru/Makefile.am: Likewise.
* man/sv/Makefile.am: Likewise.
* man/zh_CN/Makefile.am: Likewise.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/ChangeLog 2012-05-20 10:18:33 UTC (rev 3731)
@@ -1,5 +1,22 @@
2012-05-20 Nicolas François <nicolas.francois at centraliens.net>
+ * NEWS, man/generate_mans.mak: Generate manpages in man1, man3,
+ man5, man8 subdirectories. This fix the generation of .so links
+ which did not point to a path relative to the top-level manual
+ hierarchy.
+ * man/generate_mans.mak: Update man paths accordingly.
+ * man/Makefile.am: Likewise.
+ * man/da/Makefile.am: Likewise.
+ * man/de/Makefile.am: Likewise.
+ * man/fr/Makefile.am: Likewise.
+ * man/it/Makefile.am: Likewise.
+ * man/pl/Makefile.am: Likewise.
+ * man/ru/Makefile.am: Likewise.
+ * man/sv/Makefile.am: Likewise.
+ * man/zh_CN/Makefile.am: Likewise.
+
+2012-05-20 Nicolas François <nicolas.francois at centraliens.net>
+
* configure.in: Prepare for next point release 4.1.5.1.
2012-05-19 Nitin A Kamble <nitin.a.kamble at intel.com>
Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/NEWS 2012-05-20 10:18:33 UTC (rev 3731)
@@ -8,6 +8,9 @@
- userdel
* Fix segfault when userdel removes the user's group.
+*** documentation
+ * .so links now point to paths relative to the top-level manual hierarchy
+
*** translation
* Updated French man pages translation.
* Updated German man pages translation.
Modified: upstream/trunk/man/Makefile.am
===================================================================
--- upstream/trunk/man/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -7,52 +7,52 @@
endif
man_MANS = \
- chage.1 \
- chfn.1 \
- chgpasswd.8 \
- chpasswd.8 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- gpasswd.1 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- grpconv.8 \
- grpunconv.8 \
- gshadow.5 \
- lastlog.8 \
- login.1 \
- login.defs.5 \
- logoutd.8 \
- newgrp.1 \
- newusers.8 \
- nologin.8 \
- passwd.1 \
- passwd.5 \
- pwck.8 \
- pwconv.8 \
- pwunconv.8 \
- sg.1 \
- shadow.3 \
- shadow.5 \
- su.1 \
- suauth.5 \
- useradd.8 \
- userdel.8 \
- usermod.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chfn.1 \
+ man8/chgpasswd.8 \
+ man8/chpasswd.8 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man1/gpasswd.1 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man8/grpconv.8 \
+ man8/grpunconv.8 \
+ man5/gshadow.5 \
+ man8/lastlog.8 \
+ man1/login.1 \
+ man5/login.defs.5 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/newusers.8 \
+ man8/nologin.8 \
+ man1/passwd.1 \
+ man5/passwd.5 \
+ man8/pwck.8 \
+ man8/pwconv.8 \
+ man8/pwunconv.8 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man5/shadow.5 \
+ man1/su.1 \
+ man5/suauth.5 \
+ man8/useradd.8 \
+ man8/userdel.8 \
+ man8/usermod.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- limits.5 \
- login.access.5 \
- porttime.5
+ man5/limits.5 \
+ man5/login.access.5 \
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -166,9 +166,9 @@
$(man_MANS) \
$(man_XMANS) \
$(addprefix login.defs.d/,$(login_defs_v)) \
- id.1 \
+ man1/id.1 \
id.1.xml \
- sulogin.8 \
+ man8/sulogin.8 \
sulogin.8.xml \
generate_mans.mak \
generate_translations.mak
@@ -179,7 +179,7 @@
generate_mans.deps: *.xml
echo "# This file is generated" > $@
- awk 'BEGIN{FS="\"";} /^<!ENTITY .* * SYSTEM ".*">$$/{ f=FILENAME; sub(/.xml/,"",f); print f ": " $$2 }' $(man_XMANS) >> $@
+ awk 'BEGIN{FS="\"";} /^<!ENTITY .* * SYSTEM ".*">$$/{ f=FILENAME; sub(/.xml/,"",f); print "man" substr(f, length (f)) "/" f ": " $$2 }' $(man_XMANS) >> $@
if ENABLE_REGENERATE_MAN
Modified: upstream/trunk/man/da/Makefile.am
===================================================================
--- upstream/trunk/man/da/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/da/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -3,16 +3,16 @@
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = \
- chfn.1 \
- groupdel.8 \
- groups.1 \
- gshadow.5 \
- logoutd.8 \
- newgrp.1 \
- nologin.8 \
- sg.1 \
- vigr.8 \
- vipw.8
+ man1/chfn.1 \
+ man8/groupdel.8 \
+ man1/groups.1 \
+ man5/gshadow.5 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/nologin.8 \
+ man1/sg.1 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam =
@@ -22,7 +22,7 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1
+ man1/id.1
if USE_PAM
EXTRA_DIST += $(man_nopam)
Modified: upstream/trunk/man/de/Makefile.am
===================================================================
--- upstream/trunk/man/de/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/de/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -2,52 +2,52 @@
mandir = @mandir@/de
man_MANS = \
- chage.1 \
- chfn.1 \
- chgpasswd.8 \
- chpasswd.8 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- gpasswd.1 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- grpconv.8 \
- grpunconv.8 \
- gshadow.5 \
- lastlog.8 \
- login.1 \
- login.defs.5 \
- logoutd.8 \
- newgrp.1 \
- newusers.8 \
- nologin.8 \
- passwd.1 \
- passwd.5 \
- pwck.8 \
- pwconv.8 \
- pwunconv.8 \
- sg.1 \
- shadow.3 \
- shadow.5 \
- su.1 \
- suauth.5 \
- useradd.8 \
- userdel.8 \
- usermod.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chfn.1 \
+ man8/chgpasswd.8 \
+ man8/chpasswd.8 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man1/gpasswd.1 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man8/grpconv.8 \
+ man8/grpunconv.8 \
+ man5/gshadow.5 \
+ man8/lastlog.8 \
+ man1/login.1 \
+ man5/login.defs.5 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/newusers.8 \
+ man8/nologin.8 \
+ man1/passwd.1 \
+ man5/passwd.5 \
+ man8/pwck.8 \
+ man8/pwconv.8 \
+ man8/pwunconv.8 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man5/shadow.5 \
+ man1/su.1 \
+ man5/suauth.5 \
+ man8/useradd.8 \
+ man8/userdel.8 \
+ man8/usermod.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- limits.5 \
- login.access.5 \
- porttime.5
+ man5/limits.5 \
+ man5/login.access.5 \
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -55,8 +55,8 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1 \
- sulogin.8
+ man1/id.1 \
+ man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)
Modified: upstream/trunk/man/fr/Makefile.am
===================================================================
--- upstream/trunk/man/fr/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/fr/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -2,52 +2,52 @@
mandir = @mandir@/fr
man_MANS = \
- chage.1 \
- chfn.1 \
- chgpasswd.8 \
- chpasswd.8 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- gpasswd.1 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- grpconv.8 \
- grpunconv.8 \
- gshadow.5 \
- lastlog.8 \
- login.1 \
- login.defs.5 \
- logoutd.8 \
- newgrp.1 \
- newusers.8 \
- nologin.8 \
- passwd.1 \
- passwd.5 \
- pwck.8 \
- pwconv.8 \
- pwunconv.8 \
- sg.1 \
- shadow.3 \
- shadow.5 \
- su.1 \
- suauth.5 \
- useradd.8 \
- userdel.8 \
- usermod.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chfn.1 \
+ man8/chgpasswd.8 \
+ man8/chpasswd.8 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man1/gpasswd.1 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man8/grpconv.8 \
+ man8/grpunconv.8 \
+ man5/gshadow.5 \
+ man8/lastlog.8 \
+ man1/login.1 \
+ man5/login.defs.5 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/newusers.8 \
+ man8/nologin.8 \
+ man1/passwd.1 \
+ man5/passwd.5 \
+ man8/pwck.8 \
+ man8/pwconv.8 \
+ man8/pwunconv.8 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man5/shadow.5 \
+ man1/su.1 \
+ man5/suauth.5 \
+ man8/useradd.8 \
+ man8/userdel.8 \
+ man8/usermod.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- limits.5 \
- login.access.5 \
- porttime.5
+ man5/limits.5 \
+ man5/login.access.5 \
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -55,8 +55,8 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1 \
- sulogin.8
+ man1/id.1 \
+ man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)
Modified: upstream/trunk/man/generate_mans.mak
===================================================================
--- upstream/trunk/man/generate_mans.mak 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/generate_mans.mak 2012-05-20 10:18:33 UTC (rev 3731)
@@ -28,8 +28,10 @@
sed -e 's/^\(<!DOCTYPE .*docbookx.dtd"\)>/\1 [<!ENTITY % config SYSTEM "config.xml">%config;]>/' $< > $@; \
fi
-%: %.xml-config Makefile config.xml
+man1/% man3/% man5/% man8/%: %.xml-config Makefile config.xml
$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND)" \
+ --stringparam "man.output.base.dir" "" \
+ --param "man.output.in.separate.dir" "1" \
-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
else
$(man_MANS):
@@ -37,8 +39,8 @@
@false
endif
-grpconv.8 grpunconv.8 pwunconv.8: pwconv.8
+man8/grpconv.8 man8/grpunconv.8 man8/pwunconv.8: man8/pwconv.8
-getspnam.3: shadow.3
+man3/getspnam.3: man3/shadow.3
-vigr.8: vipw.8
+man8/vigr.8: man8/vipw.8
Modified: upstream/trunk/man/it/Makefile.am
===================================================================
--- upstream/trunk/man/it/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/it/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -2,52 +2,52 @@
mandir = @mandir@/it
man_MANS = \
- chage.1 \
- chfn.1 \
- chgpasswd.8 \
- chpasswd.8 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- gpasswd.1 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- grpconv.8 \
- grpunconv.8 \
- gshadow.5 \
- lastlog.8 \
- login.1 \
- login.defs.5 \
- logoutd.8 \
- newgrp.1 \
- newusers.8 \
- nologin.8 \
- passwd.1 \
- passwd.5 \
- pwck.8 \
- pwconv.8 \
- pwunconv.8 \
- sg.1 \
- shadow.3 \
- shadow.5 \
- su.1 \
- suauth.5 \
- useradd.8 \
- userdel.8 \
- usermod.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chfn.1 \
+ man8/chgpasswd.8 \
+ man8/chpasswd.8 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man1/gpasswd.1 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man8/grpconv.8 \
+ man8/grpunconv.8 \
+ man5/gshadow.5 \
+ man8/lastlog.8 \
+ man1/login.1 \
+ man5/login.defs.5 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/newusers.8 \
+ man8/nologin.8 \
+ man1/passwd.1 \
+ man5/passwd.5 \
+ man8/pwck.8 \
+ man8/pwconv.8 \
+ man8/pwunconv.8 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man5/shadow.5 \
+ man1/su.1 \
+ man5/suauth.5 \
+ man8/useradd.8 \
+ man8/userdel.8 \
+ man8/usermod.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- limits.5 \
- login.access.5 \
- porttime.5
+ man5/limits.5 \
+ man5/login.access.5 \
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -55,8 +55,8 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1 \
- sulogin.8
+ man1/id.1 \
+ man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)
Modified: upstream/trunk/man/pl/Makefile.am
===================================================================
--- upstream/trunk/man/pl/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/pl/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -3,30 +3,30 @@
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = \
- chage.1 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- lastlog.8 \
- logoutd.8 \
- newgrp.1 \
- sg.1 \
- shadow.3 \
- userdel.8 \
- usermod.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man8/lastlog.8 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man8/userdel.8 \
+ man8/usermod.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- porttime.5
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -34,7 +34,7 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1
+ man1/id.1
if USE_PAM
EXTRA_DIST += $(man_nopam)
Modified: upstream/trunk/man/ru/Makefile.am
===================================================================
--- upstream/trunk/man/ru/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/ru/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -2,52 +2,52 @@
mandir = @mandir@/ru
man_MANS = \
- chage.1 \
- chfn.1 \
- chgpasswd.8 \
- chpasswd.8 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- gpasswd.1 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- grpconv.8 \
- grpunconv.8 \
- gshadow.5 \
- lastlog.8 \
- login.1 \
- login.defs.5 \
- logoutd.8 \
- newgrp.1 \
- newusers.8 \
- nologin.8 \
- passwd.1 \
- passwd.5 \
- pwck.8 \
- pwconv.8 \
- pwunconv.8 \
- sg.1 \
- shadow.3 \
- shadow.5 \
- su.1 \
- suauth.5 \
- useradd.8 \
- userdel.8 \
- usermod.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chfn.1 \
+ man8/chgpasswd.8 \
+ man8/chpasswd.8 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man1/gpasswd.1 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man8/grpconv.8 \
+ man8/grpunconv.8 \
+ man5/gshadow.5 \
+ man8/lastlog.8 \
+ man1/login.1 \
+ man5/login.defs.5 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/newusers.8 \
+ man8/nologin.8 \
+ man1/passwd.1 \
+ man5/passwd.5 \
+ man8/pwck.8 \
+ man8/pwconv.8 \
+ man8/pwunconv.8 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man5/shadow.5 \
+ man1/su.1 \
+ man5/suauth.5 \
+ man8/useradd.8 \
+ man8/userdel.8 \
+ man8/usermod.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- limits.5 \
- login.access.5 \
- porttime.5
+ man5/limits.5 \
+ man5/login.access.5 \
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -55,8 +55,8 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1 \
- sulogin.8
+ man1/id.1 \
+ man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)
Modified: upstream/trunk/man/sv/Makefile.am
===================================================================
--- upstream/trunk/man/sv/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/sv/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -2,36 +2,36 @@
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = \
- chage.1 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- gshadow.5 \
- lastlog.8 \
- logoutd.8 \
- newgrp.1 \
- nologin.8 \
- passwd.1 \
- passwd.5 \
- pwck.8 \
- sg.1 \
- shadow.3 \
- suauth.5 \
- userdel.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man5/gshadow.5 \
+ man8/lastlog.8 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/nologin.8 \
+ man1/passwd.1 \
+ man5/passwd.5 \
+ man8/pwck.8 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man5/suauth.5 \
+ man8/userdel.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- limits.5 \
- porttime.5
+ man5/limits.5 \
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -39,7 +39,7 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1
+ man1/id.1
if USE_PAM
EXTRA_DIST += $(man_nopam)
Modified: upstream/trunk/man/zh_CN/Makefile.am
===================================================================
--- upstream/trunk/man/zh_CN/Makefile.am 2012-05-20 10:07:55 UTC (rev 3730)
+++ upstream/trunk/man/zh_CN/Makefile.am 2012-05-20 10:18:33 UTC (rev 3731)
@@ -2,52 +2,52 @@
mandir = @mandir@/zh_CN
man_MANS = \
- chage.1 \
- chfn.1 \
- chgpasswd.8 \
- chpasswd.8 \
- chsh.1 \
- expiry.1 \
- faillog.5 \
- faillog.8 \
- getspnam.3 \
- gpasswd.1 \
- groupadd.8 \
- groupdel.8 \
- groupmems.8 \
- groupmod.8 \
- groups.1 \
- grpck.8 \
- grpconv.8 \
- grpunconv.8 \
- gshadow.5 \
- lastlog.8 \
- login.1 \
- login.defs.5 \
- logoutd.8 \
- newgrp.1 \
- newusers.8 \
- nologin.8 \
- passwd.1 \
- passwd.5 \
- pwck.8 \
- pwconv.8 \
- pwunconv.8 \
- sg.1 \
- shadow.3 \
- shadow.5 \
- su.1 \
- suauth.5 \
- useradd.8 \
- userdel.8 \
- usermod.8 \
- vigr.8 \
- vipw.8
+ man1/chage.1 \
+ man1/chfn.1 \
+ man8/chgpasswd.8 \
+ man8/chpasswd.8 \
+ man1/chsh.1 \
+ man1/expiry.1 \
+ man5/faillog.5 \
+ man8/faillog.8 \
+ man3/getspnam.3 \
+ man1/gpasswd.1 \
+ man8/groupadd.8 \
+ man8/groupdel.8 \
+ man8/groupmems.8 \
+ man8/groupmod.8 \
+ man1/groups.1 \
+ man8/grpck.8 \
+ man8/grpconv.8 \
+ man8/grpunconv.8 \
+ man5/gshadow.5 \
+ man8/lastlog.8 \
+ man1/login.1 \
+ man5/login.defs.5 \
+ man8/logoutd.8 \
+ man1/newgrp.1 \
+ man8/newusers.8 \
+ man8/nologin.8 \
+ man1/passwd.1 \
+ man5/passwd.5 \
+ man8/pwck.8 \
+ man8/pwconv.8 \
+ man8/pwunconv.8 \
+ man1/sg.1 \
+ man3/shadow.3 \
+ man5/shadow.5 \
+ man1/su.1 \
+ man5/suauth.5 \
+ man8/useradd.8 \
+ man8/userdel.8 \
+ man8/usermod.8 \
+ man8/vigr.8 \
+ man8/vipw.8
man_nopam = \
- limits.5 \
- login.access.5 \
- porttime.5
+ man5/limits.5 \
+ man5/login.access.5 \
+ man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@@ -55,8 +55,8 @@
EXTRA_DIST = \
$(man_MANS) \
- id.1 \
- sulogin.8
+ man1/id.1 \
+ man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)
More information about the Pkg-shadow-commits
mailing list