[Gpg4win-commits] r1046 - in trunk: . patches/gpgme-1.1.7 po
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 18 19:38:24 CET 2008
Author: werner
Date: 2008-11-18 19:38:21 +0100 (Tue, 18 Nov 2008)
New Revision: 1046
Added:
trunk/patches/gpgme-1.1.7/03-error-parsing.patch
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/configure.ac
trunk/po/ar.po
trunk/po/de.po
trunk/po/es.po
trunk/po/fr.po
trunk/po/ru.po
Log:
Getting closer to a release.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/ChangeLog 2008-11-18 18:38:21 UTC (rev 1046)
@@ -1,3 +1,10 @@
+2008-11-18 Werner Koch <wk at g10code.com>
+
+ Release 1.9.12.
+
+ * patches/gpgme-1.1.7/03-error-parsing.patch: New.
+ * Makefile.am (EXTRA_DIST): Add patch.
+
2008-11-18 Colin Leroy <colin at colino.net>
* packages/packages.current: Update Claws-Mail Vcalendar
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/Makefile.am 2008-11-18 18:38:21 UTC (rev 1046)
@@ -35,6 +35,7 @@
patches/gpgme/02-kleo-bugs-workaround.patch \
patches/gpgme-1.1.7/01-registry.patch \
patches/gpgme-1.1.7/02-extern-umlaute.patch \
+ patches/gpgme-1.1.7/03-error-parsing.patch \
patches/libetpan-0.54/01-config.patch \
patches/libetpan-0.54/02-index.patch \
patches/winpt/01-gpg-path.patch \
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/NEWS 2008-11-18 18:38:21 UTC (rev 1046)
@@ -3,7 +3,7 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in version 1.9.12
+Noteworthy changes in version 1.9.12 (2008-11-18)
-------------------------------------------------
(en) This is a BETA version of the new Gpg4win/2 architecture.
@@ -13,13 +13,13 @@
eingesetzt werden.
~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn
+GnuPG: 2.0.10-svn4870
DirMngr: 1.0.3-svn310
-Kleopatra:
+Kleopatra: 20081117
GPA: 0.8.0
-GpgOL: 0.10.1
+GpgOL: 0.10.17
GpgEX: 0.9.1
-Claws-Mail: 3.6.1cvs20
+Claws-Mail: 3.6.1cvs32
Kompendium: 3.0.0-beta
~~~~~~~~~~~~~~~
@@ -38,7 +38,7 @@
DirMngr: 1.0.3-svn310
Kleopatra: 20081111
GPA: 0.8.0
-GpgOL: 0.10.1
+GpgOL: 0.10.16
GpgEX: 0.9.1
Claws-Mail: 3.6.1cvs20
Kompendium: 3.0.0-beta
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/configure.ac 2008-11-18 18:38:21 UTC (rev 1046)
@@ -25,8 +25,8 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.9.12])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [1.9.12-beta])
+m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
Added: trunk/patches/gpgme-1.1.7/03-error-parsing.patch
===================================================================
--- trunk/patches/gpgme-1.1.7/03-error-parsing.patch 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/patches/gpgme-1.1.7/03-error-parsing.patch 2008-11-18 18:38:21 UTC (rev 1046)
@@ -0,0 +1,41 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2008-11-18 Werner Koch <wk at g10code.com>
+
+ * decrypt.c (_gpgme_decrypt_status_handler): Use
+ _gpgme_map_gnupg_error to parse the error code for decrypt.algorithm.
+
+
+Index: gpgme/decrypt.c
+===================================================================
+--- gpgme/decrypt.c (revision 1345)
++++ gpgme/decrypt.c (working copy)
+@@ -180,7 +180,6 @@
+ related to the backend. */
+ {
+ const char d_alg[] = "decrypt.algorithm";
+- const char u_alg[] = "Unsupported_Algorithm";
+ const char k_alg[] = "decrypt.keyusage";
+
+ if (!strncmp (args, d_alg, sizeof (d_alg) - 1))
+@@ -189,11 +188,13 @@
+ while (*args == ' ')
+ args++;
+
+- if (!strncmp (args, u_alg, sizeof (u_alg) - 1))
++ if (gpg_err_code (_gpgme_map_gnupg_error (args))
++ == GPG_ERR_UNSUPPORTED_ALGORITHM)
+ {
+ char *end;
+
+- args += sizeof (u_alg) - 1;
++ while (*args && *args != ' ')
++ args++;
+ while (*args == ' ')
+ args++;
+
+
+
+
Property changes on: trunk/patches/gpgme-1.1.7/03-error-parsing.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/po/ar.po 2008-11-18 18:38:21 UTC (rev 1046)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-11-11 18:53+0100\n"
+"POT-Creation-Date: 2008-11-18 18:51+0100\n"
"PO-Revision-Date: 2008-03-11 23:52+0200\n"
"Last-Translator: Ahmad Gharbeia <ahmad at gharbeia.org>\n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -23,12 +23,12 @@
msgid "An instance of this installer is already running."
msgstr "ÊÚãá ÓíÑæÑÉ ÃÎÑì ãä åÐÇ ÇáãõËÈøöÊ ÈÇáÝÚá."
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:115
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ Gpg4win"
-#: src/gpg4win.nsi:118
+#: src/gpg4win.nsi:119
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@
"ÇáÈíÇäÇÊ æ ÇáÊæÞíÚ ÇáÑÞãíº æ åæ íÔÊãá Úáì æÓíáÉ ãÊÞÏãÉ áÅÏÇÑÉ ÇáãÝÇÊíÍ¡ "
"æíÊæÇÝÞ ãÚ ãÚíÇÑ ÇáÅäÊÑäÊ OpenPGP ÇáãÞÊÑÍ ßãÇ æõÕöÝ Ýí RFC2440."
-#: src/gpg4win.nsi:124
+#: src/gpg4win.nsi:125
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Gpg4win"
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:128
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:131
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/po/de.po 2008-11-18 18:38:21 UTC (rev 1046)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 2.0\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-11-11 18:53+0100\n"
+"POT-Creation-Date: 2008-11-18 18:51+0100\n"
"PO-Revision-Date: 2008-11-12 10:39+0100\n"
"Last-Translator: Werner Koch <wk at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Ein Exemplar dieses Installers läuft bereits."
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:115
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Willkommen bei der Installation von Gpg4win"
-#: src/gpg4win.nsi:118
+#: src/gpg4win.nsi:119
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -36,17 +36,17 @@
"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
"zum sicheren Speichern von Daten."
-#: src/gpg4win.nsi:124
+#: src/gpg4win.nsi:125
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Dies ist Gpg4win Version ${VERSION}"
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:128
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "Dateiversion ${PROD_VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:131
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "Releasedatum ${_BUILD_ISODATE}"
Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/po/es.po 2008-11-18 18:38:21 UTC (rev 1046)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-11-11 18:53+0100\n"
+"POT-Creation-Date: 2008-11-18 18:51+0100\n"
"PO-Revision-Date: 2008-01-30 17:07+0100\n"
"Last-Translator: Diego Escalante Urrelo <diegoe at gnome.org>\n"
"Language-Team: Spanish <diegoe at gnome.org>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Una instancia del instalador ya está ejecutándose."
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:115
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Bienvenido a la instalación de Gpg4win"
-#: src/gpg4win.nsi:118
+#: src/gpg4win.nsi:119
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -38,17 +38,17 @@
"Incluye un gestor de llaves avanzado y cumple con la propuesta de estándar "
"de Internet: OpenGPG, descrito en el RFC2440."
-#: src/gpg4win.nsi:124
+#: src/gpg4win.nsi:125
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Este es Gpg4win versión ${VERSION}"
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:128
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "versión del archivo ${PROD_VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:131
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "fecha de publicación ${_BUILD_ISODATE}"
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/po/fr.po 2008-11-18 18:38:21 UTC (rev 1046)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ngoinabox\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-11-11 18:53+0100\n"
+"POT-Creation-Date: 2008-11-18 18:51+0100\n"
"PO-Revision-Date: 2008-03-10 16:46+0100\n"
"Last-Translator: Fabian Rodriguez <magicfab at member.fsf.org>\n"
"Language-Team: FRENCH <aep.lists at it46.se>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Une instance de cet installateur fonctionne déjà."
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:115
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Bienvenue à l'installation de Gpg4win"
-#: src/gpg4win.nsi:118
+#: src/gpg4win.nsi:119
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -39,17 +39,17 @@
"est conforme avec l'OpenPGP proposé Internet standard as described in "
"RFC2440."
-#: src/gpg4win.nsi:124
+#: src/gpg4win.nsi:125
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "This is Gpg4win version ${VERSION}"
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:128
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "file version ${PROD_VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:131
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "release date ${_BUILD_ISODATE}"
Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po 2008-11-18 15:50:25 UTC (rev 1045)
+++ trunk/po/ru.po 2008-11-18 18:38:21 UTC (rev 1046)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win Installer\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-11-11 18:53+0100\n"
+"POT-Creation-Date: 2008-11-18 18:51+0100\n"
"PO-Revision-Date: 2008-04-22 11:57+0200\n"
"Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
"Language-Team: Human Rights Network <moscow at hro.org>\n"
@@ -21,12 +21,12 @@
msgid "An instance of this installer is already running."
msgstr "Óñòàíîâêà ïðîãðàììû óæå çàïóùåíà."
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:115
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Äîáðî ïîæàëîâàòü â ïðîãðàììó óñòàíîâêè Gpg4win!"
-#: src/gpg4win.nsi:118
+#: src/gpg4win.nsi:119
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@
"øèôðîâàëüíûìè êëþ÷àìè è ñîâìåñòèìà ñî ñòàíäàðòîì OpenPGP, îïèñàííûì â "
"äîêóìåíòå RFC2440."
-#: src/gpg4win.nsi:124
+#: src/gpg4win.nsi:125
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Âåðñèÿ Gpg4win ${VERSION}"
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:128
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "Âåðñèÿ ôàéëà ${PROD_VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:131
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "Äàòà ðåëèçà ${_BUILD_ISODATE}"
More information about the Gpg4win-commits
mailing list