[Pkg-shadow-commits] r3290 - in upstream/trunk: . man man/po

Nicolas FRANÇOIS nekral-guest at alioth.debian.org
Sat Feb 12 14:57:39 UTC 2011


Author: nekral-guest
Date: 2011-02-12 14:57:37 +0000 (Sat, 12 Feb 2011)
New Revision: 3290

Added:
   upstream/trunk/man/po/Makefile.in
   upstream/trunk/man/po/XMLFILES
Removed:
   upstream/trunk/man/po/Makefile.in.in
   upstream/trunk/man/po/POTFILES.in
Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/autogen.sh
   upstream/trunk/configure.in
   upstream/trunk/man/Makefile.am
   upstream/trunk/man/po/LINGUAS
Log:
	* autogen.sh: Restore original autoreconf (see 2010-08-29's change
	for autogen.sh)
	* configure.in, man/po/Makefile.in.in, man/po/Makefile.in:
	Makefile.in.in replaced by Makefile.in to avoid config.status
	issues when there are multiple po directories.
	* man/po/LINGUAS: Adapted to above change.
	* man/po/POTFILES.in, man/po/XMLFILES: POTFILES.in replaced by
	XMLFILES.
	* man/Makefile.am: generate_mans.deps shall be included by make,
	not automake.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-11-19 21:54:41 UTC (rev 3289)
+++ upstream/trunk/ChangeLog	2011-02-12 14:57:37 UTC (rev 3290)
@@ -1,3 +1,16 @@
+2011-02-12  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* autogen.sh: Restore original autoreconf (see 2010-08-29's change
+	for autogen.sh)
+	* configure.in, man/po/Makefile.in.in, man/po/Makefile.in:
+	Makefile.in.in replaced by Makefile.in to avoid config.status
+	issues when there are multiple po directories.
+	* man/po/LINGUAS: Adapted to above change.
+	* man/po/POTFILES.in, man/po/XMLFILES: POTFILES.in replaced by
+	XMLFILES.
+	* man/Makefile.am: generate_mans.deps shall be included by make,
+	not automake.
+
 2010-11-19  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* NEWS, libmisc/console.c: Fix CONSOLE parser. This caused login

Modified: upstream/trunk/autogen.sh
===================================================================
--- upstream/trunk/autogen.sh	2010-11-19 21:54:41 UTC (rev 3289)
+++ upstream/trunk/autogen.sh	2011-02-12 14:57:37 UTC (rev 3290)
@@ -1,17 +1,7 @@
 #! /bin/sh
 
-# FIXME: Find a way to run autoreconf again.
-# autopoint create mess in man/po
-#autoreconf -v -f --install || exit 1
+autoreconf -v -f --install || exit 1
 
-#autoreconf executes the following
-#autopoint --force
-aclocal --force 
-libtoolize --copy --force
-/usr/bin/autoconf --force
-/usr/bin/autoheader --force
-automake --add-missing --copy --force-missing
-
 ./configure \
 	CFLAGS="-O2 -Wall" \
 	--enable-man \

Modified: upstream/trunk/configure.in
===================================================================
--- upstream/trunk/configure.in	2010-11-19 21:54:41 UTC (rev 3289)
+++ upstream/trunk/configure.in	2011-02-12 14:57:37 UTC (rev 3290)
@@ -586,7 +586,7 @@
 	doc/Makefile
 	man/Makefile
 	man/config.xml
-	man/po/Makefile.in
+	man/po/Makefile
 	man/cs/Makefile
 	man/de/Makefile
 	man/es/Makefile

Modified: upstream/trunk/man/Makefile.am
===================================================================
--- upstream/trunk/man/Makefile.am	2010-11-19 21:54:41 UTC (rev 3289)
+++ upstream/trunk/man/Makefile.am	2011-02-12 14:57:37 UTC (rev 3290)
@@ -180,7 +180,7 @@
 
 if ENABLE_REGENERATE_MAN
 
-include generate_mans.deps
+ at ENABLE_REGENERATE_MAN_TRUE@include generate_mans.deps
 
 include generate_mans.mak
 

Modified: upstream/trunk/man/po/LINGUAS
===================================================================
--- upstream/trunk/man/po/LINGUAS	2010-11-19 21:54:41 UTC (rev 3289)
+++ upstream/trunk/man/po/LINGUAS	2011-02-12 14:57:37 UTC (rev 3290)
@@ -1,6 +1,4 @@
-de
-fr
-it
-pl
-ru
-sv
+LINGUAS = de fr it pl ru sv
+POFILES = $(srcdir)/de.po $(srcdir)/fr.po $(srcdir)/it.po $(srcdir)/pl.po $(srcdir)/ru.po $(srcdir)/sv.po
+UPDATEPOFILES = de.po-update fr.po-update it.po-update pl.po-update ru.po-update sv.po-update
+DUMMYPOFILES = de.nop fr.nop it.nop pl.nop ru.nop sv.nop

Copied: upstream/trunk/man/po/Makefile.in (from rev 3289, upstream/trunk/man/po/Makefile.in.in)
===================================================================
--- upstream/trunk/man/po/Makefile.in	                        (rev 0)
+++ upstream/trunk/man/po/Makefile.in	2011-02-12 14:57:37 UTC (rev 3290)
@@ -0,0 +1,243 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.16
+# Modified to handle translations with xml2po by Nicolas François - 2007
+
+PACKAGE = shadow
+VERSION = 4.1.4.2+svn3283
+PACKAGE_BUGREPORT = 
+
+SHELL = /bin/sh
+
+
+srcdir = .
+top_srcdir = ../..
+
+
+MSGFMT_ = /usr/bin/msgfmt
+MSGFMT_no = /usr/bin/msgfmt
+MSGFMT_yes = /usr/bin/msgfmt
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = /usr/bin/xgettext
+XGETTEXT_no = /usr/bin/xgettext
+XGETTEXT_yes = /usr/bin/xgettext
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge --previous
+MSGMERGE_UPDATE = /usr/bin/msgmerge --update --previous
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+include $(srcdir)/LINGUAS
+#DISTFILES.common = Makefile.in remove-potcdate.sin
+DISTFILES.common = remove-potcdate.sin
+DISTFILES = $(DISTFILES.common) Makevars XMLFILES LINGUAS $(POFILES)
+
+include $(srcdir)/XMLFILES
+
+include $(srcdir)/Makevars
+
+.SUFFIXES:
+.SUFFIXES: .po .sed .sin .nop .po-create .po-update
+
+remove-potcdate.sin: ../../po/remove-potcdate.sin
+	cp ../../po/remove-potcdate.sin .
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: all-yes
+
+all-yes: stamp-po
+all-no:
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# TODO: set MSGID_BUGS_ADDRESS, COPYRIGHT_HOLDER
+$(DOMAIN).pot-update: $(XMLFILES) $(srcdir)/XMLFILES remove-potcdate.sed
+	@set -e; tmpdir=`pwd`; \
+	echo "cd $(top_srcdir)/man"; \
+	cd $(top_srcdir)/man; \
+	echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(XMLFILES))"; \
+	xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(XMLFILES)); \
+	cd $$tmpdir
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data:
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data:
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data:
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+# avant for precedant
+#	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+#Makefile: Makefile.in Makevars $(top_builddir)/config.status LINGUAS
+#	cd $(top_builddir) \
+#	  && $(SHELL) ./config.status $(subdir)/$@
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Deleted: upstream/trunk/man/po/Makefile.in.in
===================================================================
--- upstream/trunk/man/po/Makefile.in.in	2010-11-19 21:54:41 UTC (rev 3289)
+++ upstream/trunk/man/po/Makefile.in.in	2011-02-12 14:57:37 UTC (rev 3290)
@@ -1,243 +0,0 @@
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
-#
-# Origin: gettext-0.16
-# Modified to handle translations with xml2po by Nicolas François - 2007
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-SHELL = /bin/sh
- at SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = @XGETTEXT@
-XGETTEXT_no = @XGETTEXT@
-XGETTEXT_yes = @XGETTEXT_015@
-XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge --previous
-MSGMERGE_UPDATE = @MSGMERGE@ --update --previous
-MSGINIT = msginit
-MSGCONV = msgconv
-MSGFILTER = msgfilter
-
-POFILES = @POFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in remove-potcdate.sin
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(POFILES)
-
-POTFILES = \
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .sed .sin .nop .po-create .po-update
-
-remove-potcdate.sin: ../../po/remove-potcdate.sin
-	cp ../../po/remove-potcdate.sin .
-
-.sin.sed:
-	sed -e '/^#/d' $< > t-$@
-	mv t-$@ $@
-
-
-all: all- at USE_NLS@
-
-all-yes: stamp-po
-all-no:
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
-	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
-	  echo "touch stamp-po" && \
-	  echo timestamp > stamp-poT && \
-	  mv stamp-poT stamp-po; \
-	}
-
-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-# TODO: set MSGID_BUGS_ADDRESS, COPYRIGHT_HOLDER
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	@set -e; tmpdir=`pwd`; \
-	echo "cd $(top_srcdir)/man"; \
-	cd $(top_srcdir)/man; \
-	echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES))"; \
-	xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
-	cd $$tmpdir
-	test ! -f $(DOMAIN).po || { \
-	  if test -f $(srcdir)/$(DOMAIN).pot; then \
-	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-	    else \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	    fi; \
-	  else \
-	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	  fi; \
-	}
-
-# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
-# every "make" invocation, only create it when it is missing.
-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-$(srcdir)/$(DOMAIN).pot:
-	$(MAKE) $(DOMAIN).pot-update
-
-# This target rebuilds a PO file if $(DOMAIN).pot has changed.
-# Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
-	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-	else \
-	  $(MAKE) $${lang}.po-create; \
-	fi
-
-
-install: install-exec install-data
-install-exec:
-install-data:
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data:
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data:
-
-check: all
-
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
-mostlyclean:
-	rm -f remove-potcdate.sed
-	rm -f stamp-poT
-	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f stamp-po
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-	$(MAKE) update-po
-	@$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	if test -f $(srcdir)/$(DOMAIN).pot; then \
-	  dists="$$dists $(DOMAIN).pot stamp-po"; \
-	fi; \
-	if test -f $(srcdir)/ChangeLog; then \
-	  dists="$$dists ChangeLog"; \
-	fi; \
-	for i in 0 1 2 3 4 5 6 7 8 9; do \
-	  if test -f $(srcdir)/ChangeLog.$$i; then \
-	    dists="$$dists ChangeLog.$$i"; \
-	  fi; \
-	done; \
-	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-	for file in $$dists; do \
-	  if test -f $$file; then \
-	    cp -p $$file $(distdir) || exit 1; \
-	  else \
-	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-	  fi; \
-	done
-
-update-po: Makefile
-	$(MAKE) $(DOMAIN).pot-update
-	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-
-# General rule for creating PO files.
-
-.nop.po-create:
-	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-	exit 1
-
-# General rule for updating PO files.
-
-.nop.po-update:
-	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-	cd $(srcdir); \
-	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "msgmerge for $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-$(DUMMYPOFILES):
-
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-	cd $(top_builddir) \
-	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

Deleted: upstream/trunk/man/po/POTFILES.in
===================================================================
--- upstream/trunk/man/po/POTFILES.in	2010-11-19 21:54:41 UTC (rev 3289)
+++ upstream/trunk/man/po/POTFILES.in	2011-02-12 14:57:37 UTC (rev 3290)
@@ -1,41 +0,0 @@
-# List of xml which contain translatable strings.
-
-man/chage.1.xml
-man/chfn.1.xml
-man/chgpasswd.8.xml
-man/chpasswd.8.xml
-man/chsh.1.xml
-man/expiry.1.xml
-man/faillog.5.xml
-man/faillog.8.xml
-man/gpasswd.1.xml
-man/groupadd.8.xml
-man/groupdel.8.xml
-man/groupmems.8.xml
-man/groupmod.8.xml
-man/groups.1.xml
-man/grpck.8.xml
-man/gshadow.5.xml
-man/lastlog.8.xml
-man/limits.5.xml
-man/login.1.xml
-man/login.access.5.xml
-man/login.defs.5.xml
-man/logoutd.8.xml
-man/newgrp.1.xml
-man/newusers.8.xml
-man/nologin.8.xml
-man/passwd.1.xml
-man/passwd.5.xml
-man/porttime.5.xml
-man/pwck.8.xml
-man/pwconv.8.xml
-man/shadow.3.xml
-man/shadow.5.xml
-man/sg.1.xml
-man/su.1.xml
-man/suauth.5.xml
-man/useradd.8.xml
-man/userdel.8.xml
-man/usermod.8.xml
-man/vipw.8.xml

Copied: upstream/trunk/man/po/XMLFILES (from rev 3289, upstream/trunk/man/po/POTFILES.in)
===================================================================
--- upstream/trunk/man/po/XMLFILES	                        (rev 0)
+++ upstream/trunk/man/po/XMLFILES	2011-02-12 14:57:37 UTC (rev 3290)
@@ -0,0 +1,42 @@
+# List of xml which contain translatable strings.
+XMLFILES = \
+	$(top_srcdir)/man/chage.1.xml \
+	$(top_srcdir)/man/chfn.1.xml \
+	$(top_srcdir)/man/chgpasswd.8.xml \
+	$(top_srcdir)/man/chpasswd.8.xml \
+	$(top_srcdir)/man/chsh.1.xml \
+	$(top_srcdir)/man/expiry.1.xml \
+	$(top_srcdir)/man/faillog.5.xml \
+	$(top_srcdir)/man/faillog.8.xml \
+	$(top_srcdir)/man/gpasswd.1.xml \
+	$(top_srcdir)/man/groupadd.8.xml \
+	$(top_srcdir)/man/groupdel.8.xml \
+	$(top_srcdir)/man/groupmems.8.xml \
+	$(top_srcdir)/man/groupmod.8.xml \
+	$(top_srcdir)/man/groups.1.xml \
+	$(top_srcdir)/man/grpck.8.xml \
+	$(top_srcdir)/man/gshadow.5.xml \
+	$(top_srcdir)/man/lastlog.8.xml \
+	$(top_srcdir)/man/limits.5.xml \
+	$(top_srcdir)/man/login.1.xml \
+	$(top_srcdir)/man/login.access.5.xml \
+	$(top_srcdir)/man/login.defs.5.xml \
+	$(top_srcdir)/man/logoutd.8.xml \
+	$(top_srcdir)/man/newgrp.1.xml \
+	$(top_srcdir)/man/newusers.8.xml \
+	$(top_srcdir)/man/nologin.8.xml \
+	$(top_srcdir)/man/passwd.1.xml \
+	$(top_srcdir)/man/passwd.5.xml \
+	$(top_srcdir)/man/porttime.5.xml \
+	$(top_srcdir)/man/pwck.8.xml \
+	$(top_srcdir)/man/pwconv.8.xml \
+	$(top_srcdir)/man/shadow.3.xml \
+	$(top_srcdir)/man/shadow.5.xml \
+	$(top_srcdir)/man/sg.1.xml \
+	$(top_srcdir)/man/su.1.xml \
+	$(top_srcdir)/man/suauth.5.xml \
+	$(top_srcdir)/man/useradd.8.xml \
+	$(top_srcdir)/man/userdel.8.xml \
+	$(top_srcdir)/man/usermod.8.xml \
+	$(top_srcdir)/man/vipw.8.xml
+




More information about the Pkg-shadow-commits mailing list