kov changed gksu/trunk/ChangeLog, gksu/trunk/aclocal.m4,
gksu/trunk/configure.ac, gksu/trunk/po/gksu.pot
Gustavo Noronha
kov at costa.debian.org
Wed Oct 26 13:04:32 UTC 2005
Mensagem de log:
* Release 1.3.6
-----
Modified: gksu/trunk/ChangeLog
===================================================================
--- gksu/trunk/ChangeLog 2005-10-26 12:51:57 UTC (rev 465)
+++ gksu/trunk/ChangeLog 2005-10-26 13:04:30 UTC (rev 466)
@@ -1,5 +1,7 @@
2005-10-26 Gustavo Noronha Silva <kov at debian.org>
+ * Release 1.3.6
+
* gksu/gksu.c:
- make sure the no-pass window will go away before proceeding
with calling the program, so we won't have a dead window
Modified: gksu/trunk/aclocal.m4
===================================================================
--- gksu/trunk/aclocal.m4 2005-10-26 12:51:57 UTC (rev 465)
+++ gksu/trunk/aclocal.m4 2005-10-26 13:04:30 UTC (rev 466)
@@ -47,7 +47,7 @@
[case "${enableval}" in
yes) schemas_install=true ;;
no) schemas_install=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-schemas-install) ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
esac],[schemas_install=true])
AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue)
])
@@ -6427,7 +6427,7 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+ _pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
@@ -6463,14 +6463,30 @@
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
+ fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
@@ -6492,19 +6508,30 @@
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
if test $pkg_failed = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.])],
+_PKG_TEXT
+])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -6512,9 +6539,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
Modified: gksu/trunk/configure.ac
===================================================================
--- gksu/trunk/configure.ac 2005-10-26 12:51:57 UTC (rev 465)
+++ gksu/trunk/configure.ac 2005-10-26 13:04:30 UTC (rev 466)
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
-AC_INIT(gksu, 1.3.5, kov at debian.org)
+AC_INIT(gksu, 1.3.6, kov at debian.org)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AC_CONFIG_SRCDIR(gksu/gksu.c)
AM_CONFIG_HEADER(config.h)
Modified: gksu/trunk/po/gksu.pot
===================================================================
--- gksu/trunk/po/gksu.pot 2005-10-26 12:51:57 UTC (rev 465)
+++ gksu/trunk/po/gksu.pot 2005-10-26 13:04:30 UTC (rev 466)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-29 22:24-0300\n"
+"POT-Creation-Date: 2005-10-26 11:01-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../gksu/gksu.c:341
+#: ../gksu/gksu.c:396
#, c-format
msgid ""
"GKsu version %s\n"
@@ -73,7 +73,7 @@
"\n"
msgstr ""
-#: ../gksu/gksu.c:417
+#: ../gksu/gksu.c:472
msgid ""
"<b>Could not grab your mouse.</b>\n"
"\n"
@@ -85,7 +85,7 @@
"Try again."
msgstr ""
-#: ../gksu/gksu.c:427
+#: ../gksu/gksu.c:482
msgid ""
"Could not grab your keyboard.\n"
"A malicious client may be eavesdropping\n"
@@ -96,29 +96,29 @@
"Try again."
msgstr ""
-#: ../gksu/gksu.c:483
+#: ../gksu/gksu.c:538
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: ../gksu/gksu.c:503
+#: ../gksu/gksu.c:558
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: ../gksu/gksu.c:713
+#: ../gksu/gksu.c:771
#, c-format
msgid ""
"<b>Please enter your password\n"
"to run %s as user %s</b>"
msgstr ""
-#: ../gksu/gksu.c:718
+#: ../gksu/gksu.c:776
#, c-format
msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
msgstr ""
-#: ../gksu/gksu.c:806
+#: ../gksu/gksu.c:872
#, c-format
msgid ""
"<b>The \"%s\" program was started with the privileges of the %s user without "
@@ -131,11 +131,11 @@
"are aware of this."
msgstr ""
-#: ../gksu/gksu.c:827
+#: ../gksu/gksu.c:893
msgid "Do _not display this message again"
msgstr ""
-#: ../gksu/gksu.c:868
+#: ../gksu/gksu.c:936
#, c-format
msgid ""
"<b>Authentication required</b>\n"
@@ -144,7 +144,7 @@
"\"%s\"."
msgstr ""
-#: ../gksu/gksu.c:872
+#: ../gksu/gksu.c:940
#, c-format
msgid ""
"<b>Authentication required</b>\n"
@@ -153,22 +153,22 @@
"\"%s\"."
msgstr ""
-#: ../gksu/gksu.c:1034
+#: ../gksu/gksu.c:1102
#, c-format
msgid "Option not accepted for --disable-grab: %s\n"
msgstr ""
-#: ../gksu/gksu.c:1057
+#: ../gksu/gksu.c:1125
#, c-format
msgid "Option not accepted for --sudo-mode: %s\n"
msgstr ""
-#: ../gksu/gksu.c:1074
+#: ../gksu/gksu.c:1142
#, c-format
msgid "Option not accepted for --prompt: %s\n"
msgstr ""
-#: ../gksu/gksu.c:1106
+#: ../gksu/gksu.c:1174
msgid ""
"<b>Would you like your screen to be \"grabbed\"\n"
"while you enter the password?</b>\n"
@@ -178,21 +178,21 @@
"application while you type it."
msgstr ""
-#: ../gksu/gksu.c:1144
+#: ../gksu/gksu.c:1212
#, c-format
msgid "<b>Please enter %s's password</b>"
msgstr ""
-#: ../gksu/gksu.c:1181 ../gksu/gksu.c:1196 ../gksu/gksuexec.c:319
+#: ../gksu/gksu.c:1249 ../gksu/gksu.c:1264 ../gksu/gksuexec.c:319
msgid "Missing command to run."
msgstr ""
-#: ../gksu/gksu.c:1221
+#: ../gksu/gksu.c:1289
#, c-format
msgid "User %s does not exist."
msgstr ""
-#: ../gksu/gksu.c:1239
+#: ../gksu/gksu.c:1307
#, c-format
msgid ""
"<b>Failed to run %s as user %s.</b>\n"
@@ -200,19 +200,19 @@
"%s"
msgstr ""
-#: ../gksu/gksu.c:1262
+#: ../gksu/gksu.c:1330
msgid "Remember password"
msgstr ""
-#: ../gksu/gksu.c:1279
+#: ../gksu/gksu.c:1347
msgid "Save for this session"
msgstr ""
-#: ../gksu/gksu.c:1284
+#: ../gksu/gksu.c:1352
msgid "Save in the keyring"
msgstr ""
-#: ../gksu/gksu.c:1305
+#: ../gksu/gksu.c:1373
#, c-format
msgid ""
"Failed to run %s as user %s:\n"
@@ -221,7 +221,7 @@
#: ../gksu/gksuexec.c:68
#, c-format
-msgid "Unable to run %s/bin/gksu: %s"
+msgid "Unable to run %s: %s"
msgstr ""
#: ../gksu/gksuexec.c:104
More information about the gksu-commits
mailing list