Update libgpg-error.
authorWerner Koch <wk@gnupg.org>
Wed, 26 Nov 2008 13:57:02 +0000 (13:57 +0000)
committerWerner Koch <wk@gnupg.org>
Wed, 26 Nov 2008 13:57:02 +0000 (13:57 +0000)
Put version number into software installation menu.

ChangeLog
packages/packages.current
src/gpg4win-src.nsi
src/installer-finish.nsi

index cbbd18e..3b67155 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-26  Werner Koch  <wk@g10code.com>
+
+       * packages/packages.current: Update libgpg-error.
+
+       * src/installer-finish.nsi: Put version into the displayed name of
+       the last section.
+
+       * src/gpg4win.nsi (PRETTY_PACKAGE): Downcase the "for".
+       * src/gpg4win-src.nsi (PRETTY_PACKAGE): Ditto.
+
 2008-11-20  Werner Koch  <wk@g10code.com>
 
        * packages/packages.current: Update GnuPG.
index da6cdc9..0d41110 100644 (file)
@@ -306,8 +306,8 @@ chk  ae1b992721198b93198aa36eb7a3a7d074417f47
 #
 server ftp://ftp.gnupg.org/gcrypt
 
-file libgpg-error/libgpg-error-1.6.tar.bz2
-chk  2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3
+file libgpg-error/libgpg-error-1.7.tar.bz2
+chk  bf8c6babe1e28cae7dd6374ca24ddcc42d57e902 
 
 file libksba/libksba-1.0.4.tar.bz2
 chk  05d0b803bac34b53e07619ca52425452be535792
index 6dad64d..f251ee6 100644 (file)
@@ -33,7 +33,7 @@
 # NOTE: Please keep the capitalization of PRETTY_PACKAGE_SHORT as it is
 # used as registry key.
 !define PACKAGE "${_PACKAGE}-src"
-!define PRETTY_PACKAGE "GnuPG For Windows Sources"
+!define PRETTY_PACKAGE "GnuPG for Windows Sources"
 !define PRETTY_PACKAGE_SHORT "GPG4WinSrc"
 !define VERSION "${_VERSION}"
 !define PROD_VERSION "${_BUILD_FILEVERSION}"
index 6f92730..c47fb67 100644 (file)
@@ -24,10 +24,14 @@ Section
   WriteUninstaller "$INSTDIR\${PACKAGE}-uninstall.exe"
 
   # Windows Add/Remove Programs support
+  # Note that the version is appended to the DisplayName, despite that
+  # this is not necessary as a click on "support information" gives
+  # the version number.  Some tools do that, other don't.  I don't
+  # like it but others want me to do that.  -wk
   StrCpy $MYTMP "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRETTY_PACKAGE_SHORT}"
   WriteRegExpandStr HKLM $MYTMP "UninstallString" '"$INSTDIR\${PACKAGE}-uninstall.exe"'
   WriteRegExpandStr HKLM $MYTMP "InstallLocation" "$INSTDIR"
-  WriteRegStr       HKLM $MYTMP "DisplayName"     "${PRETTY_PACKAGE}"
+  WriteRegStr       HKLM $MYTMP "DisplayName"     "${PRETTY_PACKAGE} (${VERSION})"
   WriteRegStr       HKLM $MYTMP "DisplayIcon"     "$INSTDIR\gpg.exe,0"
   WriteRegStr       HKLM $MYTMP "DisplayVersion"  "${VERSION}"
   WriteRegStr       HKLM $MYTMP "Publisher"       "The Gpg4win Project"