gnome-system-tools r4334 - in trunk: . m4 po

[vuntz svn gnome org]

Author: vuntz
Date: Tue Mar 17 15:32:04 2009
New Revision: 4334
URL: http://svn.gnome.org/viewvc/gnome-system-tools?rev=4334&view=rev

Log:
2009-03-16  Vincent Untz  <vuntz gnome org>

	* NEWS: version 2.22.2


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/m4/gnome-doc-utils.m4
   trunk/m4/intltool.m4
   trunk/po/Makefile.in.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Mar 17 15:32:04 2009
@@ -1,3 +1,55 @@
+GNOME System Tools Version 2.22.2, 2009-03-17
+-----------------------------------------------
+
+The GNOME System Tools version 2.22.2 have been released.
+
+The GNOME System Tools are a set of cross-platform configuration utilities for Linux and other Unix systems. The frontends knows nothing about the underlying system and provide the same user interface across the different types of systems. Internally they use the Liboobs library.
+
+Changes since last release
+==========================
+
+  General
+  =======
+  - Clean up GTK Includes (Maxim Ermilov)
+  - Remove usage of deprecated API (Andre Klapper, Thomas H.P. Andersen)
+
+  Translation
+  ===========
+  - ar (Anas Husseini)
+  - as (Amitakhya Phukan)
+  - ast (Astur)
+  - bn_IN (Runa Bhattacharjee)
+  - de (Mario BlÃttermann)
+  - dz (Dawa pemo)
+  - en_GB (Jen Ockwell)
+  - es (Jorge GonzÃlez)
+  - fi (Ilkka Tuohela)
+  - gl (Suso Baleato)
+  - he (Mark Krapivner)
+  - hi (Rajesh Ranjan)
+  - it (Francesco Marletta)
+  - ko (Changwoo Ryu)
+  - lv (Raivis Dejus)
+  - or (Manoj Kumar Giri)
+  - pl (Tomasz Dominikowski)
+  - ps (Zabeeh Khan)
+  - pt_BR (Leonardo Ferreira Fontenelle)
+  - ro (Adi Roiban)
+  - sk (Pavol KlaÄanskÃ)
+  - sv (Daniel Nylander)
+  - te (Krishna Babu K)
+  - th (Theppitak Karoonboonyanan)
+  - zh_HK (Woodman Tuen)
+  - zh_TW (Woodman Tuen)
+
+  Thanks to anyone involved in this release.
+
+Downloading
+===========
+You can get it from :
+ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/2.22/
+
+
 GNOME System Tools Version 2.22.1, 2008-09-23
 -----------------------------------------------
 

Modified: trunk/m4/gnome-doc-utils.m4
==============================================================================
--- trunk/m4/gnome-doc-utils.m4	(original)
+++ trunk/m4/gnome-doc-utils.m4	Tue Mar 17 15:32:04 2009
@@ -36,7 +36,8 @@
 # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
 #
 AC_DEFUN([GNOME_DOC_INIT],
-[
+[AC_REQUIRE([AC_PROG_LN_S])dnl
+
 ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
 
 PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],

Modified: trunk/m4/intltool.m4
==============================================================================
--- trunk/m4/intltool.m4	(original)
+++ trunk/m4/intltool.m4	Tue Mar 17 15:32:04 2009
@@ -24,8 +24,9 @@
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL],
-[AC_PREREQ([2.50])dnl
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
 
 case "$am__api_version" in
     1.[01234])
@@ -98,6 +99,7 @@
 AC_PATH_PROG(XGETTEXT, xgettext)
 AC_PATH_PROG(MSGMERGE, msgmerge)
 AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
@@ -169,6 +171,9 @@
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
     rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
     >"$1/stamp-it.tmp"
     [sed '/^#/d
@@ -177,22 +182,17 @@
 	'"s|^|	$ac_top_srcdir/|" \
       "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
     ]
-    if test ! -f "$1/Makefile"; then
-      AC_MSG_ERROR([$1/Makefile is not ready.])
-    fi
-    mv "$1/Makefile" "$1/Makefile.tmp"
     [sed '/^POTFILES =/,/[^\\]$/ {
 		/^POTFILES =/!d
 		r $1/POTFILES
 	  }
-	 ' "$1/Makefile.tmp" >"$1/Makefile"]
+	 ' "$1/Makefile.in" >"$1/Makefile"]
     rm -f "$1/Makefile.tmp"
     mv "$1/stamp-it.tmp" "$1/stamp-it"
   ])
 ])dnl
 ])
 
-
 # deprecated macros
 AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # A hint is needed for aclocal from Automake <= 1.9.4:

Modified: trunk/po/Makefile.in.in
==============================================================================
--- trunk/po/Makefile.in.in	(original)
+++ trunk/po/Makefile.in.in	Tue Mar 17 15:32:04 2009
@@ -54,16 +54,16 @@
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
 USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
 # This comment gets stripped out