[Gpg4win-commits] r760 - in trunk: . packages src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-03-26 13:26:46 +0100 (Wed, 26 Mar 2008)
New Revision: 760

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/packages/packages.current
   trunk/src/inst-gnupg.nsi
   trunk/src/inst-gnupg2.nsi
Log:
Updated GnuPG.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-25 13:19:23 UTC (rev 759)
+++ trunk/ChangeLog	2008-03-26 12:26:46 UTC (rev 760)
@@ -1,3 +1,13 @@
+2008-03-26  Werner Koch  <wk at g10code.com>
+
+	* packages/packages.current: Update to GnuPG 2.0.9.
+	* Makefile.am (EXTRA_DIST): Remove gnupg-2.0.8 patches.
+
+	* src/inst-gnupg2.nsi: Install the help files.
+	* src/uninst-gnupg2.nsi: Remove them.
+	* src/inst-gnupg.nsi: Now delete the Lang Registry entry becuase
+	GnuPG 2.0.9 does not need it anymore.
+
 2008-03-25  Werner Koch  <wk at g10code.com>
 
 	* src/inst-gnupg.nsi: Write the language code for use by gettext

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-03-25 13:19:23 UTC (rev 759)
+++ trunk/Makefile.am	2008-03-26 12:26:46 UTC (rev 760)
@@ -58,12 +58,6 @@
 	patches/claws-mail-3.1.0cvs70/03-smime-plugin.patch \
 	patches/claws-mail-3.1.0cvs70/99-auto.patch \
 	patches/gpgme/01-gpg2.patch \
-	patches/gnupg2-2.0.8/01-agent-call-pinentry.patch \
-	patches/gnupg2-2.0.8/02-qualified.patch \
-	patches/gnupg2-2.0.8/03-create-keyring.patch \
-        patches/gnupg2-2.0.8/04-import-export-spawn.patch \
-        patches/gnupg2-2.0.8/05-gpgconf.patch \
-        patches/gnupg2-2.0.8/06-gpgconf-list.patch \
         patches/gnupg-1.4.8/01-gpgconf-list.patch \
 	patches/winpt/01-gpg-path.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-03-25 13:19:23 UTC (rev 759)
+++ trunk/packages/packages.current	2008-03-26 12:26:46 UTC (rev 760)
@@ -258,9 +258,9 @@
 file gnupg/gnupg-1.4.8.tar.bz2
 chk  4b63267358e5c70f05b48e27d6877bad2636cabd
 
-#name gnupg2-2.0.9-svn4694.tar.bz2
-#file alpha/gnupg/gnupg-2.0.9-svn4694.tar.bz2
-#chk  58244bfc723f2aca14f6690a7d9169469e4df269
+name gnupg2-2.0.9.tar.bz2
+file gnupg/gnupg-2.0.9.tar.bz2
+chk  959bdb934e3a72d256bfbd0122d996a73adb5d1f
 
 file libgpg-error/libgpg-error-1.6.tar.bz2
 chk  2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3
@@ -283,10 +283,6 @@
 file gpgme-1.1.7-svn1304.tar.bz2
 chk  005dc484aa48766fd9d8acd27d092a6ed84f3a01
 
-name gnupg2-2.0.9-svn4695.tar.bz2
-file gnupg-2.0.9-svn4695.tar.bz2
-chk  6fd61827493b73bf3b95a9e88fa4469c44602ae0  
-
 file libassuan-1.0.5-svn284.tar.bz2
 chk  be26eeb3f73c2eafb0e65e94b341092cf90267e1
 

Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi	2008-03-25 13:19:23 UTC (rev 759)
+++ trunk/src/inst-gnupg.nsi	2008-03-26 12:26:46 UTC (rev 760)
@@ -81,15 +81,11 @@
 
   WriteRegStr HKLM "Software\GNU\GnuPG" "Install Directory" $INSTDIR
 
-  # To allow setting the language on a per user base we can't use the
-  # the installer language but need to resort to a Registry entry.  We
-  # put the language into HKLM so that the user can override it using
-  # a HKCU entry or the LANGUAGE envvar.  Probably Windows has a
-  # scheme to do this using a Windows specific API but that was not
-  # known at the time we invented our simple-gettext scheme for a
-  # command line utility.  A GUI frontend may want to synchronize the
-  # HKCU entry with whatever Windows uses for the local language.
-  WriteRegStr HKLM "Software\GNU\GnuPG" "Lang" "$(T_LangCode)"
+  # We used to determine the language using a Registry entry.
+  # Although we don't want to delete the user's Lang Resgistry Setting
+  # becuase he might have have selected a different language than his
+  # default.  We delete the gloabl Lang of the installation.
+  DeleteRegValue HKLM "Software\GNU\GnuPG" "Lang" 
 
   # This old key is required for GPGee.  Please do not use in new
   # applications.

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2008-03-25 13:19:23 UTC (rev 759)
+++ trunk/src/inst-gnupg2.nsi	2008-03-26 12:26:46 UTC (rev 760)
@@ -71,16 +71,19 @@
   #File "${prefix}/share/gnupg/com-certs.pem"
   File "${prefix}/share/gnupg/gpg-conf.skel"
 
-  SetOutPath "$INSTDIR\etc\gnupg"
-  File /oname=gpgconf-conf.skel "${source}/doc/examples/gpgconf.conf"
-
   # Install the language files for gpg.  Note that the PO files are
   # required to be UTF-8 encoded and that the post-install macro in
   # Makefile.am needs to build them.  The language used is selected by
   # using a Registry entry; see ints-gnupg.nsi.
+  File /nonfatal "${prefix}/share/gnupg/help.*.txt"
   SetOutPath "$INSTDIR\gnupg2.nls"
   File /nonfatal "${prefix}/share/gnupg/*.mo"
 
+
+  SetOutPath "$INSTDIR\etc\gnupg"
+  File /oname=gpgconf-conf.skel "${source}/doc/examples/gpgconf.conf"
+
+
   # If requested, install the configuration files.
   ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
   StrCmp $0 "" no_config_gpg_conf_files