[Gpg4win-commits] r1114 - in trunk: . packages patches/gpgme src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-02-27 13:33:16 +0100 (Fri, 27 Feb 2009)
New Revision: 1114

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/packages/packages.current
   trunk/patches/gpgme/01-gpg2.patch
   trunk/patches/gpgme/02-kleo-bugs-workaround.patch
   trunk/src/inst-gpa.nsi
   trunk/src/uninst-gpa.nsi
Log:
Update gpa, gpgme and gpgol


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-26 19:04:47 UTC (rev 1113)
+++ trunk/ChangeLog	2009-02-27 12:33:16 UTC (rev 1114)
@@ -1,3 +1,12 @@
+2009-02-27  Werner Koch  <wk at g10code.com>
+
+	* src/inst-gpa.nsi: Change logo name.
+
+	* packages/packages.current: Update paperkey and GpgOL.
+
+	* patches/gpgme/01-gpg2.patch:  Change directory name. 
+	* patches/gpgme/02-kleo-bugs-workaround.patch: Ditto.
+
 2009-02-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (EXTRA_DIST): Add patches/gpgex/01-no-checksums.patch.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-02-26 19:04:47 UTC (rev 1113)
+++ trunk/NEWS	2009-02-27 12:33:16 UTC (rev 1114)
@@ -17,7 +17,7 @@
 DirMngr:      1.0.3-svn310
 Kleopatra:    20081128
 GPA:          0.8.0
-GpgOL:        0.10.18
+GpgOL:        0.10.19
 GpgEX:        0.9.2
 Claws-Mail:   3.7.0
 Kompendium:   3.0.0-beta

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2009-02-26 19:04:47 UTC (rev 1113)
+++ trunk/packages/packages.current	2009-02-27 12:33:16 UTC (rev 1114)
@@ -267,8 +267,8 @@
 #
 server ftp://ftp.g10code.com/g10code/gpgol/alpha
 
-file gpgol-0.10.18.tar.bz2
-chk  e746ceea56684f773d2540d3af3b1e46157e3c54
+file gpgol-0.10.19.tar.bz2
+chk  a16918820a96b7b2820ab1723a38d62bff0cc863
 
 #
 # GpgEX
@@ -339,8 +339,8 @@
 #
 server http://www.jabberwocky.com/software/paperkey
 
-file paperkey-1.0.tar.gz
-chk  ddb5fa5612df365ae0ba324ba307d3aa2e549981
+file paperkey-1.1.tar.gz
+chk  3953e853b8ee11ca476670e7f97e94a18bca83e3 
 
 #
 # adns

Modified: trunk/patches/gpgme/01-gpg2.patch
===================================================================
--- trunk/patches/gpgme/01-gpg2.patch	2009-02-26 19:04:47 UTC (rev 1113)
+++ trunk/patches/gpgme/01-gpg2.patch	2009-02-27 12:33:16 UTC (rev 1114)
@@ -5,8 +5,8 @@
 Change gpgme to use gpg2.exe by default.
 
 
---- gpgme/w32-util.c
-+++ gpgme/w32-util.c
+--- src/w32-util.c
++++ src/w32-util.c
 @@ -307,9 +307,9 @@
    if (!gpg_program)
      gpg_program = find_program_in_registry ("gpgProgram");

Modified: trunk/patches/gpgme/02-kleo-bugs-workaround.patch
===================================================================
--- trunk/patches/gpgme/02-kleo-bugs-workaround.patch	2009-02-26 19:04:47 UTC (rev 1113)
+++ trunk/patches/gpgme/02-kleo-bugs-workaround.patch	2009-02-27 12:33:16 UTC (rev 1114)
@@ -4,9 +4,9 @@
 
 Work around bugs in kleopatra 20080706.
 
-diff -rup gpgme/keylist.c gpgme/keylist.c
---- gpgme/keylist.c	2008-01-28 19:06:04.000000000 +0100
-+++ gpgme/keylist.c	2008-07-08 21:16:39.000000000 +0200
+diff -rup src/keylist.c src/keylist.c
+--- src/keylist.c	2008-01-28 19:06:04.000000000 +0100
++++ src/keylist.c	2008-07-08 21:16:39.000000000 +0200
 @@ -918,6 +918,14 @@ gpgme_op_keylist_end (gpgme_ctx_t ctx)
    if (!ctx)
      return gpg_error (GPG_ERR_INV_VALUE);
@@ -22,9 +22,9 @@
    return 0;
  }
  
-diff -rup gpgme/w32-io.c gpgme/w32-io.c
---- gpgme/w32-io.c	2008-06-26 15:03:27.000000000 +0200
-+++ gpgme/w32-io.c	2008-07-08 18:20:12.000000000 +0200
+diff -rup src/w32-io.c src/w32-io.c
+--- src/w32-io.c	2008-06-26 15:03:27.000000000 +0200
++++ src/w32-io.c	2008-07-08 18:20:12.000000000 +0200
 @@ -53,8 +53,8 @@
  #define READBUF_SIZE 4096
  #define WRITEBUF_SIZE 4096
@@ -36,9 +36,9 @@
  
  static struct
  {
-diff -rup gpgme/wait-global.c gpgme/wait-global.c
---- gpgme/wait-global.c	2008-07-04 16:15:41.000000000 +0200
-+++ gpgme/wait-global.c	2008-07-08 21:15:03.000000000 +0200
+diff -rup src/wait-global.c src/wait-global.c
+--- src/wait-global.c	2008-07-04 16:15:41.000000000 +0200
++++ src/wait-global.c	2008-07-08 21:15:03.000000000 +0200
 @@ -386,5 +386,13 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error
      }
    while (hang);
@@ -53,9 +53,9 @@
 +
    return ctx;
  }
-diff -rup gpgme/wait-private.c gpgme/wait-private.c
---- gpgme/wait-private.c	2008-07-04 16:15:41.000000000 +0200
-+++ gpgme/wait-private.c	2008-07-08 21:17:05.000000000 +0200
+diff -rup src/wait-private.c src/wait-private.c
+--- src/wait-private.c	2008-07-04 16:15:41.000000000 +0200
++++ src/wait-private.c	2008-07-08 21:17:05.000000000 +0200
 @@ -31,6 +31,7 @@
  #include "ops.h"
  #include "priv-io.h"

Modified: trunk/src/inst-gpa.nsi
===================================================================
--- trunk/src/inst-gpa.nsi	2009-02-26 19:04:47 UTC (rev 1113)
+++ trunk/src/inst-gpa.nsi	2009-02-27 12:33:16 UTC (rev 1114)
@@ -50,7 +50,8 @@
   File ${prefix}/share/locale/ru/LC_MESSAGES/gpa.mo
 
   SetOutPath "$INSTDIR\share\gpa"
-  File ${prefix}/share/gpa/gpa_logo.ppm
+  File /nonfatal ${prefix}/share/gpa/gpa_logo.ppm
+  File /nonfatal ${prefix}/share/gpa/gpa-logo.ppm
   File ${prefix}/share/gpa/gpa.png
 
   # If requested, install the configuration files.

Modified: trunk/src/uninst-gpa.nsi
===================================================================
--- trunk/src/uninst-gpa.nsi	2009-02-26 19:04:47 UTC (rev 1113)
+++ trunk/src/uninst-gpa.nsi	2009-02-27 12:33:16 UTC (rev 1114)
@@ -55,6 +55,7 @@
   Delete "$INSTDIR\share\gpa\gpa_tips.en"
   Delete "$INSTDIR\share\gpa\gpa_tips.de"
   Delete "$INSTDIR\share\gpa\gpa_logo.ppm"
+  Delete "$INSTDIR\share\gpa\gpa-logo.ppm"
   Delete "$INSTDIR\share\gpa\gpa.png"
   RMDir "$INSTDIR\share\gpa"
   RMDir "$INSTDIR\share"