[Pkg-shadow-commits] r3065 - in upstream/trunk: . man man/po
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Mon Sep 7 21:49:29 UTC 2009
Author: nekral-guest
Date: 2009-09-07 21:49:29 +0000 (Mon, 07 Sep 2009)
New Revision: 3065
Modified:
upstream/trunk/ChangeLog
upstream/trunk/man/generate_mans.deps
upstream/trunk/man/generate_mans.mak
upstream/trunk/man/generate_translations.mak
upstream/trunk/man/groupadd.8.xml
upstream/trunk/man/po/Makefile.in.in
Log:
* man/generate_translations.mak, man/generate_mans.mak,
po/Makefile.in.in: Removing and restoring the config.xml file
broke parallel builds. Build the manpages based on *.xml-config
files instead of *.xml files. The *.xml do not include config.xml
anymore, which permits to run xml2po without needing to remove
config.xml. The config.xml is restored in the *.xml-config files.
* man/groupadd.8.xml: Implementation of the above.
* man/generate_mans.deps: Updated dependencies
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2009-09-07 19:50:00 UTC (rev 3064)
+++ upstream/trunk/ChangeLog 2009-09-07 21:49:29 UTC (rev 3065)
@@ -1,3 +1,14 @@
+2009-09-07 Nicolas François <nicolas.francois at centraliens.net>
+
+ * man/generate_translations.mak, man/generate_mans.mak,
+ po/Makefile.in.in: Removing and restoring the config.xml file
+ broke parallel builds. Build the manpages based on *.xml-config
+ files instead of *.xml files. The *.xml do not include config.xml
+ anymore, which permits to run xml2po without needing to remove
+ config.xml. The config.xml is restored in the *.xml-config files.
+ * man/groupadd.8.xml: Implementation of the above.
+ * man/generate_mans.deps: Updated dependencies
+
2009-09-07 Steve Grubb <sgrubb at redhat.com>
* libmisc/limits.c: Fix the format to match the unsigned long
Modified: upstream/trunk/man/generate_mans.deps
===================================================================
--- upstream/trunk/man/generate_mans.deps 2009-09-07 19:50:00 UTC (rev 3064)
+++ upstream/trunk/man/generate_mans.deps 2009-09-07 21:49:29 UTC (rev 3065)
@@ -17,7 +17,6 @@
groupadd.8: login.defs.d/GID_MAX.xml
groupadd.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
groupadd.8: login.defs.d/SYS_GID_MAX.xml
-groupadd.8: config.xml
groupdel.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
groupmems.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
groupmod.8: login.defs.d/MAX_MEMBERS_PER_GROUP.xml
Modified: upstream/trunk/man/generate_mans.mak
===================================================================
--- upstream/trunk/man/generate_mans.mak 2009-09-07 19:50:00 UTC (rev 3064)
+++ upstream/trunk/man/generate_mans.mak 2009-09-07 21:49:29 UTC (rev 3065)
@@ -15,7 +15,10 @@
SHA_CRYPT_COND=no_sha_crypt
endif
-%: %.xml Makefile config.xml
+%.xml-config: %.xml Makefile
+ sed -e 's/^<!-- SHADOW-CONFIG-HERE -->/<!ENTITY % config SYSTEM "config.xml">%config;/' $< > $@
+
+%: %.xml-config Makefile config.xml
if ENABLE_REGENERATE_MAN
$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(SHA_CRYPT_COND)" \
-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
Modified: upstream/trunk/man/generate_translations.mak
===================================================================
--- upstream/trunk/man/generate_translations.mak 2009-09-07 19:50:00 UTC (rev 3064)
+++ upstream/trunk/man/generate_translations.mak 2009-09-07 21:49:29 UTC (rev 3065)
@@ -2,11 +2,8 @@
%.xml: ../%.xml ../po/$(LANG).po
if ENABLE_REGENERATE_MAN
- [ ! -f ../config.xml ] || mv ../config.xml ../config.xml.bak
xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@
- [ ! -f ../config.xml.bak ] || mv ../config.xml.bak ../config.xml
- sed -i 's/config SYSTEM "config.xml">/config SYSTEM "config.xml">\%config;/' $@
else
@echo you need to run configure with --enable-man to generate man pages
@false
Modified: upstream/trunk/man/groupadd.8.xml
===================================================================
--- upstream/trunk/man/groupadd.8.xml 2009-09-07 19:50:00 UTC (rev 3064)
+++ upstream/trunk/man/groupadd.8.xml 2009-09-07 21:49:29 UTC (rev 3065)
@@ -33,8 +33,7 @@
<!ENTITY GID_MAX SYSTEM "login.defs.d/GID_MAX.xml">
<!ENTITY MAX_MEMBERS_PER_GROUP SYSTEM "login.defs.d/MAX_MEMBERS_PER_GROUP.xml">
<!ENTITY SYS_GID_MAX SYSTEM "login.defs.d/SYS_GID_MAX.xml">
-<!ENTITY % config SYSTEM "config.xml">
-%config;
+<!-- SHADOW-CONFIG-HERE -->
]>
<refentry id='groupadd.8'>
<!-- $Id$ -->
Modified: upstream/trunk/man/po/Makefile.in.in
===================================================================
--- upstream/trunk/man/po/Makefile.in.in 2009-09-07 19:50:00 UTC (rev 3064)
+++ upstream/trunk/man/po/Makefile.in.in 2009-09-07 21:49:29 UTC (rev 3065)
@@ -94,12 +94,8 @@
@set -e; tmpdir=`pwd`; \
echo "cd $(top_srcdir)/man"; \
cd $(top_srcdir)/man; \
- echo "[ ! -f config.xml ] || mv config.xml config.xml.bak"; \
- [ ! -f config.xml ] || mv config.xml config.xml.bak; \
echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES))"; \
xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
- echo "[ ! -f config.xml.bak ] || mv config.xml.bak config.xml"; \
- [ ! -f config.xml.bak ] || mv config.xml.bak config.xml; \
cd $$tmpdir
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \
More information about the Pkg-shadow-commits
mailing list