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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-06-17 12:56:57 +0200 (Wed, 17 Jun 2009)
New Revision: 1170

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/packages/packages.current
   trunk/src/installer.nsi
   trunk/src/uninst-gpg4win.nsi
Log:
Updated GnuPG.
Removed BETA warning.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-06-09 18:29:22 UTC (rev 1169)
+++ trunk/ChangeLog	2009-06-17 10:56:57 UTC (rev 1170)
@@ -1,3 +1,14 @@
+2009-06-17  Werner Koch  <wk at g10code.com>
+
+	* packages/packages.current: Update GnuPG.
+
+	* src/installer.nsi (PrintBetaWarning): Comment out.
+	(PrintNonAdminWarning): Do not call beta warning.
+
+2009-06-10  Werner Koch  <wk at g10code.com>
+
+	* src/uninst-gpg4win.nsi: Remove pub/.
+
 2009-06-09  Werner Koch  <wk at g10code.com>
 
 	* src/inst-gnupg2.nsi: Install gpgconf into pub/.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-06-09 18:29:22 UTC (rev 1169)
+++ trunk/NEWS	2009-06-17 10:56:57 UTC (rev 1170)
@@ -13,7 +13,7 @@
      eingesetzt werden.
 
 ~~~~~~~~~~~~~~~
-GnuPG:        2.0.12-svn5008
+GnuPG:        2.0.12
 DirMngr:      1.0.3-svn310
 Kleopatra:    20090514
 GPA:          0.9.0-svn1001

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2009-06-09 18:29:22 UTC (rev 1169)
+++ trunk/packages/packages.current	2009-06-17 10:56:57 UTC (rev 1170)
@@ -359,19 +359,14 @@
 file libassuan/libassuan-1.0.5.tar.bz2
 chk  f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
 
-#name gnupg2-2.0.12-svn5008.tar.bz2
-#file alpha/gnupg/gnupg-2.0.12-svn5008.tar.bz2
-#chk  4291c1cd6d2662cc9f3362cc51c08c43af255d82
+name gnupg2-2.0.12.tar.bz2
+file alpha/gnupg/gnupg-2.0.12.tar.bz2
+chk  91856f917c13a1a12622ef39995eaf59c46f7502
 
 
 # (Snapshots)
 server ftp://ftp.g10code.com/g10code/scratch
 
-name gnupg2-2.0.12-svn5041.tar.bz2
-file gnupg-2.0.12-svn5041.tar.bz2
-chk  36f350a1c79e46893e4d06a7acfd641501ce25a4
-
-
 file dirmngr-1.0.3-svn310.tar.bz2
 chk  e3f6df819419f1bff8f707cff41220a556c0b272
 

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2009-06-09 18:29:22 UTC (rev 1169)
+++ trunk/src/installer.nsi	2009-06-17 10:56:57 UTC (rev 1170)
@@ -285,9 +285,9 @@
 FunctionEnd
 
 # Display a warning if this is a Beta version.
-Function PrintBetaWarning
-   MessageBox MB_OK "$(T_BetaWarning)"
-FunctionEnd
+#Function PrintBetaWarning
+#   MessageBox MB_OK "$(T_BetaWarning)"
+#FunctionEnd
 
 
 # Display a warning if GnuPP has been detected and allow the user to abort
@@ -398,7 +398,7 @@
 # diagnostic if this is not the case and abort installation.
 Function PrintNonAdminWarning
 
-  Call PrintBetaWarning
+  #Call PrintBetaWarning
 
   ClearErrors
   UserInfo::GetName

Modified: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi	2009-06-09 18:29:22 UTC (rev 1169)
+++ trunk/src/uninst-gpg4win.nsi	2009-06-17 10:56:57 UTC (rev 1170)
@@ -104,6 +104,7 @@
   # Try to remove other top directories.
   RMDir "$INSTDIR\lib"
   RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR\pub"
   RMDir "$INSTDIR"
 
 !endif