[svn] GpgEX - r37 - in trunk: . doc po src
svn author wk
cvs at cvs.gnupg.org
Fri Nov 2 12:01:16 CET 2007
Author: wk
Date: 2007-11-02 12:01:07 +0100 (Fri, 02 Nov 2007)
New Revision: 37
Modified:
trunk/ChangeLog
trunk/autogen.sh
trunk/doc/gpgex.texi
trunk/po/de.po
trunk/src/ChangeLog
trunk/src/client.cc
trunk/src/w32-gettext.c
Log:
Protocol update "INPUT FILE" -> "FILE"
Fixed w32-gettext for modern mingw32.
Add --force to autogen.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-22 22:24:59 UTC (rev 36)
+++ trunk/ChangeLog 2007-11-02 11:01:07 UTC (rev 37)
@@ -1,3 +1,9 @@
+2007-11-02 Werner Koch <wk at g10code.com>
+
+ * autogen.sh: Add --force option.
+
+ * doc/gpgex.texi: Protocol change s/"INPUT FILE"/"FILE"/.
+
2007-10-08 Marcus Brinkmann <marcus at g10code.de>
* doc/gpgex.texi (Certificate management): New section
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2007-10-22 22:24:59 UTC (rev 36)
+++ trunk/autogen.sh 2007-11-02 11:01:07 UTC (rev 37)
@@ -39,6 +39,11 @@
MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
DIE=no
+FORCE=
+if test x"$1" = x"--force"; then
+ FORCE=" --force"
+ shift
+fi
# ***** W32 build script *******
# Used to cross-compile for Windows.
@@ -86,7 +91,7 @@
./configure --enable-maintainer-mode --prefix=${w32root} \
--host=i586-mingw32msvc --build=${build} \
--with-gpg-error-prefix=${w32root} \
- --with-gpgme-prefix=${w32root}
+ --with-libassuan-prefix=${w32root}
rc=$?
exit $rc
@@ -150,8 +155,8 @@
echo "Running autoheader..."
$AUTOHEADER
echo "Running automake --gnu ..."
-$AUTOMAKE --gnu --add-missing;
-echo "Running autoconf..."
-$AUTOCONF
+$AUTOMAKE --gnu --add-missing
+echo "Running autoconf${FORCE} ..."
+$AUTOCONF${FORCE}
echo "You may now run \"./configure --enable-maintainer-mode && make\"."
Modified: trunk/doc/gpgex.texi
===================================================================
--- trunk/doc/gpgex.texi 2007-10-22 22:24:59 UTC (rev 36)
+++ trunk/doc/gpgex.texi 2007-11-02 11:01:07 UTC (rev 37)
@@ -135,13 +135,13 @@
All commands operate on a number of input files or directories,
specified by one or more @code{INPUT} commands:
- at deffn Command INPUT FILE=@var{name} [--continued]
+ at deffn Command FILE=@var{name} [--continued]
Add the file or directory @var{name} to the list of pathnames to be
processed by the server. The parameter @var{name} must be an absolute
path name (including the drive letter) and is percent espaced (in
particular, the characters %, = and white space characters are always
escaped). The option @code{--continued} is present for all but the
-last @code{INPUT} command.
+last @code{FILE} command.
@end deffn
@@ -149,7 +149,7 @@
@section Encrypting and signing files.
First, the input files need to be specified by one or more
- at code{INPUT} commands. Afterwards, the actual operation is requested:
+ at code{FILE} commands. Afterwards, the actual operation is requested:
@deffn Command ENCRYPT_FILES --nohup
@deffnx Command SIGN_FILES --nohup
@@ -218,11 +218,11 @@
@section Managing certificates.
First, the input files need to be specified by one or more
- at code{INPUT} commands. Afterwards, the actual operation is requested:
+ at code{FILE} commands. Afterwards, the actual operation is requested:
@deffn Command IMPORT --nohup
Request that the certificates contained in the files specified by
- at code{INPUT} are imported into the local certificate databases.
+ at code{FILE} are imported into the local certificate databases.
For directories, the server may offer multiple options to the user
(for example ignore or process recursively).
@@ -241,11 +241,11 @@
@section Create and verify checksums for files.
First, the input files need to be specified by one or more
- at code{INPUT} commands. Afterwards, the actual operation is requested:
+ at code{FILE} commands. Afterwards, the actual operation is requested:
@deffn Command CHECKSUM_CREATE_FILES --nohup
Request that checksums are created for the files specifed by
- at code{INPUT}. The choice of checksum algorithm and the destination
+ at code{FILE}. The choice of checksum algorithm and the destination
storage and format for the created checksums depend on the preferences
of the user and the functionality provided by the UI server. For
directories, the server may offer multiple options to the user (for
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-10-22 22:24:59 UTC (rev 36)
+++ trunk/po/de.po 2007-11-02 11:01:07 UTC (rev 37)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gpgex 0.0.0-svn10\n"
"Report-Msgid-Bugs-To: bug-gpgex at g10code.com\n"
-"POT-Creation-Date: 2007-10-05 02:37+0200\n"
+"POT-Creation-Date: 2007-11-02 11:48+0100\n"
"PO-Revision-Date: 2007-10-08 18:34+0200\n"
"Last-Translator: Marcus Brinkmann <marcus at g10code.com>\n"
"Language-Team: German\n"
@@ -16,7 +16,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/client.cc:194
+#: src/client.cc:345
msgid "Can not access Kleopatra, see log file for details"
msgstr "Kann nicht auf Kleopatra zugreifen, siehe Protokolldatei für Details"
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2007-10-22 22:24:59 UTC (rev 36)
+++ trunk/src/ChangeLog 2007-11-02 11:01:07 UTC (rev 37)
@@ -1,3 +1,12 @@
+2007-11-02 Werner Koch <wk at g10code.com>
+
+ * w32-gettext.c (SUBLANG_BENGALI_BANGLADESH): Fix to 2 as per MSDN.
+ (SUBLANG_PUNJABI_PAKISTAN): Remove as it is not in MSDN.
+ (SUBLANG_ROMANIAN_MOLDOVA): Remove as it is not in MSDN.
+ (SUBLANG_ROMANIAN_ROMANIA): Change to value 1 as per MSDN.
+
+ * client.cc (call_assuan): Now use "FILE" instead of "INPUT FILE".
+
2007-10-22 Marcus Brinkmann <marcus at g10code.de>
* exechelp.h (gpgex_spawn_detached): Change signature to just a
Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc 2007-10-22 22:24:59 UTC (rev 36)
+++ trunk/src/client.cc 2007-11-02 11:01:07 UTC (rev 37)
@@ -308,7 +308,7 @@
/* Set the input files. We don't specify the output files. */
for (unsigned int i = 0; i < filenames.size (); i++)
{
- msg = "INPUT FILE=" + escape (filenames[i]);
+ msg = "FILE=" + escape (filenames[i]);
(void) TRACE_LOG1 ("sending cmd: %s", msg.c_str ());
Modified: trunk/src/w32-gettext.c
===================================================================
--- trunk/src/w32-gettext.c 2007-10-22 22:24:59 UTC (rev 36)
+++ trunk/src/w32-gettext.c 2007-11-02 11:01:07 UTC (rev 37)
@@ -520,10 +520,10 @@
# define SUBLANG_AZERI_CYRILLIC 0x02
# endif
# ifndef SUBLANG_BENGALI_INDIA
-# define SUBLANG_BENGALI_INDIA 0x00
+# define SUBLANG_BENGALI_INDIA 0x01
# endif
# ifndef SUBLANG_BENGALI_BANGLADESH
-# define SUBLANG_BENGALI_BANGLADESH 0x01
+# define SUBLANG_BENGALI_BANGLADESH 0x02
# endif
# ifndef SUBLANG_CHINESE_MACAU
# define SUBLANG_CHINESE_MACAU 0x05
@@ -616,17 +616,11 @@
# define SUBLANG_NEPALI_INDIA 0x02
# endif
# ifndef SUBLANG_PUNJABI_INDIA
-# define SUBLANG_PUNJABI_INDIA 0x00
+# define SUBLANG_PUNJABI_INDIA 0x01
# endif
-# ifndef SUBLANG_PUNJABI_PAKISTAN
-# define SUBLANG_PUNJABI_PAKISTAN 0x01
-# endif
# ifndef SUBLANG_ROMANIAN_ROMANIA
-# define SUBLANG_ROMANIAN_ROMANIA 0x00
+# define SUBLANG_ROMANIAN_ROMANIA 0x01
# endif
-# ifndef SUBLANG_ROMANIAN_MOLDOVA
-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
-# endif
# ifndef SUBLANG_SERBIAN_LATIN
# define SUBLANG_SERBIAN_LATIN 0x02
# endif
@@ -1054,7 +1048,6 @@
switch (sub)
{
case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
- case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
}
return "pa";
case LANG_RHAETO_ROMANCE: return "rm_CH";
@@ -1062,7 +1055,6 @@
switch (sub)
{
case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
- case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
}
return "ro";
case LANG_RUSSIAN:
More information about the Gnupg-commits
mailing list