[Gpg4win-commits] r481 - in trunk: . packages po src

Thu Aug 16 17:48:13 CEST 2007

Author: werner
Date: 2007-08-16 17:48:13 +0200 (Thu, 16 Aug 2007)
New Revision: 481

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/po/de.po
   trunk/src/inst-gnupg2.nsi
   trunk/src/inst-gpgme.nsi
   trunk/src/inst-libgcrypt.nsi
   trunk/src/inst-libgpg-error.nsi
   trunk/src/inst-libiconv.nsi
   trunk/src/inst-w32pth.nsi
Log:
ready for a release.


Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/ChangeLog	2007-08-16 15:48:13 UTC (rev 481)
@@ -1,7 +1,17 @@
 2007-08-16  Werner Koch  <wk at g10code.com>
 
-	* packages/packages.current: Updated GnuPG2 and W32pth.
+	Released 1.1.2.
 
+	* src/inst-gnupg2.nsi: Allow overwriting of gpg-agent.
+	* src/inst-libgpg-error.nsi: Allow overwriting of libgpg-error.dll.
+	* src/inst-libgcrypt.nsi: Likewise.
+	* src/inst-gpgme.nsi: Likewise.
+	* src/inst-w32pth.nsi: Likewise.
+	* src/inst-libiconv.nsi: Likewise.
+
+	* packages/packages.current: Updated GnuPG2 and W32pth.  Add
+	Dirmngr.  Add gpgme snapshot.
+
 2007-08-15  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/g4wihelp.c (config_init): Fix bug in argument parsing.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/NEWS	2007-08-16 15:48:13 UTC (rev 481)
@@ -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.1.2 (FIXME: DATE)
+Noteworthy changes in version 1.1.2 (2007-08-16)
 ------------------------------------------------
 
 (en) Updated the Claws-Mail package.  A couple of serious bugs are fixed.
@@ -14,9 +14,17 @@
 (de) Zusätzliche Konfigurationsdateien können mit der Option /C=FILE
      installiert werden.
 
+(en) Update GnuPG2 to support the chain model.
+(de) GnuPG2 wurde aktualisiert um das Kettenmodell zu unterstützen.
+
+(en) Install DirMngr along with GnuPG2.
+(de) DirMngr wird nun zusammen mit GnuPG2 installiert.
+
+
 ~~~~~~~~~~~~~~~
 GnuPG:  1.4.7 
 GnuPG2: 2.0.5
+DirMngr: 1.0.1
 GPA:    0.7.6
 GPGol:  0.9.91
 GPGee:  1.3.1

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/configure.ac	2007-08-16 15:48:13 UTC (rev 481)
@@ -26,7 +26,7 @@
 # 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.1.1])
+m4_define([my_version], [1.1.2])
 m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/packages/packages.current	2007-08-16 15:48:13 UTC (rev 481)
@@ -242,10 +242,13 @@
 file pinentry/pinentry-0.7.3.tar.gz
 chk  557b886bc7a7030fd185fbc085703ef1ed304db8
 
-file gpgme/gpgme-1.1.5.tar.bz2
-chk  dc2744b4555192546566bba754e708991677badc
+file alpha/gpgme/gpgme-1.1.5-cvs1228.tar.bz2
+chk  fbe4fe5e44d270b3ded9a68a23c5091b506ad879 
 
+file dirmngr/dirmngr-1.0.1.tar.bz2
+chk  39eb62907e5c4ddc29da00b1291c24e5267f113e
 
+
 #
 # GPA
 #

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/po/de.po	2007-08-16 15:48:13 UTC (rev 481)
@@ -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: 2007-08-15 11:48+0200\n"
+"POT-Creation-Date: 2007-08-16 16:12+0200\n"
 "PO-Revision-Date: 2007-07-09 17:09+0200\n"
 "Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
 "Language-Team: German <translation-team-de at lists.sourceforge.net>\n"

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/src/inst-gnupg2.nsi	2007-08-16 15:48:13 UTC (rev 481)
@@ -33,11 +33,20 @@
 !else
   File "${prefix}/bin/gpg2.exe"
   File "${prefix}/bin/gpgsm.exe"
+
+  ClearErrors
+  SetOverwrite try
   File "${prefix}/bin/gpg-agent.exe"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=gpg-agent.exe.tmp "${prefix}/bin/gpg-agent.exe"
+      Rename /REBOOTOK gpg-agent.exe.tmp gpg-agent.exe
+
   File "${prefix}/bin/scdaemon.exe"
   File "${prefix}/bin/gpgconf.exe"
   File "${prefix}/bin/gpg-connect-agent.exe"
 
+
   # As a special exception, these programs are not kept in
   # libexec/gnupg, where they belong.  Please see the comment in
   # gnupg/g10/keyserver.c::keyserver_spawn() for an explanation.

Modified: trunk/src/inst-gpgme.nsi
===================================================================
--- trunk/src/inst-gpgme.nsi	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/src/inst-gpgme.nsi	2007-08-16 15:48:13 UTC (rev 481)
@@ -32,7 +32,21 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgme}"
 !else
-  File ${prefix}/bin/libgpgme-11.dll
-  File ${prefix}/bin/libgpgme-glib-11.dll
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/libgpgme-11.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=libgpgme-11.dll.tmp "${prefix}/bin/libgpgme-11.dll"
+      Rename /REBOOTOK libgpgme-11.dll.tmp libgpgme-11.dll
+
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/libgpgme-glib-11.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=libgpgme-glib-11.dll.tmp "${prefix}/bin/libgpgme-glib-11.dll"
+      Rename /REBOOTOK libgpgme-glib-11.dll.tmp libgpgme-glib-11.dll
+
 !endif
 SectionEnd

Modified: trunk/src/inst-libgcrypt.nsi
===================================================================
--- trunk/src/inst-libgcrypt.nsi	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/src/inst-libgcrypt.nsi	2007-08-16 15:48:13 UTC (rev 481)
@@ -34,7 +34,14 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_libgcrypt}"
 !else
-  File ${prefix}/bin/libgcrypt-11.dll
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/libgcrypt-11.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=libgcrypt-11.dll.tmp "${prefix}/bin/libgcrypt-11.dll"
+      Rename /REBOOTOK libgcrypt-11.dll.tmp libgcrypt-11.dll
 
+
 !endif
 SectionEnd

Modified: trunk/src/inst-libgpg-error.nsi
===================================================================
--- trunk/src/inst-libgpg-error.nsi	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/src/inst-libgpg-error.nsi	2007-08-16 15:48:13 UTC (rev 481)
@@ -33,8 +33,16 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_libgpg_error}"
 !else
-  File ${prefix}/bin/libgpg-error-0.dll
 
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/libgpg-error-0.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=libgpg-error-0.dll.tmp "${prefix}/bin/libgpg-error-0.dll"
+      Rename /REBOOTOK libgpg-error-0.dll.tmp libgpg-error-0.dll
+
+
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
   File ${prefix}/share/locale/de/LC_MESSAGES/libgpg-error.mo
   SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"

Modified: trunk/src/inst-libiconv.nsi
===================================================================
--- trunk/src/inst-libiconv.nsi	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/src/inst-libiconv.nsi	2007-08-16 15:48:13 UTC (rev 481)
@@ -33,7 +33,16 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_libiconv_src}"
 !else
-  File ${prefix}/bin/iconv.dll
+
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/iconv.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=iconv.dll.tmp "${prefix}/bin/iconv.dll"
+      Rename /REBOOTOK iconv.dll.tmp iconv.dll
+
+
 !ifdef DEBUG
   # We install a couple of binaries that may be useful for testing.
   File ${prefix}/bin/charset.dll

Modified: trunk/src/inst-w32pth.nsi
===================================================================
--- trunk/src/inst-w32pth.nsi	2007-08-16 10:55:27 UTC (rev 480)
+++ trunk/src/inst-w32pth.nsi	2007-08-16 15:48:13 UTC (rev 481)
@@ -34,7 +34,14 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_w32pth}"
 !else
-  File ${prefix}/bin/libw32pth-0.dll
 
+  ClearErrors
+  SetOverwrite try
+  File "${prefix}/bin/libw32pth-0.dll"
+  SetOverwrite lastused
+  ifErrors 0 +3
+      File /oname=libw32pth-0.dll.tmp "${prefix}/bin/libw32pth-0.dll"
+      Rename /REBOOTOK libw32pth-0.dll.tmp libw32pth-0.dll
+
 !endif
 SectionEnd

