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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-08-06 09:36:26 +0200 (Wed, 06 Aug 2008)
New Revision: 871

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/src/inst-gpgol.nsi
   trunk/src/uninst-gpgol.nsi
Log:
GpgOL update.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-05 11:00:57 UTC (rev 870)
+++ trunk/ChangeLog	2008-08-06 07:36:26 UTC (rev 871)
@@ -1,3 +1,10 @@
+2008-08-06  Werner Koch  <wk at g10code.com>
+
+	* src/inst-gpgol.nsi: Install form files.
+	* src/uninst-gpgol.nsi: Unintsall form files.
+
+	* packages/packages.current: Update GpgOL.
+
 2008-08-05  Marcus Brinkmann  <marcus at ulysses.g10code.com>
 
 	* packages/packages.current: Update kdelibs and kleopatra.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-08-05 11:00:57 UTC (rev 870)
+++ trunk/NEWS	2008-08-06 07:36:26 UTC (rev 871)
@@ -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.9.5 (2008-07-21)
+Noteworthy changes in version 1.9.6
 ------------------------------------------------
 
 (en) This is a BETA version of the new Gpg4win/2 architecture.
@@ -14,10 +14,10 @@
 
 ~~~~~~~~~~~~~~~
 GnuPG:        2.0.10-svn4797
-DirMngr:      1.0.2-svn302
-Kleopatra:    20080718
+DirMngr:      1.0.2
+Kleopatra:    20080804
 GPA:          0.7.7-svn899
-GpgOL:        0.10.15-svn260
+GpgOL:        0.10.15
 GpgEX:        0.9.0
 Claws-Mail:   3.4.0
 Novices:      1.0.0
@@ -26,7 +26,7 @@
 ~~~~~~~~~~~~~~~
 
 
-Noteworthy changes in version 1.9.6
+Noteworthy changes in version 1.9.5 (2008-07-21)
 ------------------------------------------------
 
 (en) This is a BETA version of the new Gpg4win/2 architecture.
@@ -36,11 +36,11 @@
      eingesetzt werden.
 
 ~~~~~~~~~~~~~~~
-GnuPG:        
-DirMngr:      1.0.2
-Kleopatra:    
-GPA:          
-GpgOL:        
+GnuPG:        2.0.10-svn4797
+DirMngr:      1.0.2-svn302
+Kleopatra:    20080718
+GPA:          0.7.7-svn899
+GpgOL:        0.10.15-svn260
 GpgEX:        0.9.0
 Claws-Mail:   3.4.0
 Novices:      1.0.0

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-08-05 11:00:57 UTC (rev 870)
+++ trunk/configure.ac	2008-08-06 07:36:26 UTC (rev 871)
@@ -25,7 +25,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.9.5-beta])
+m4_define([my_version], [1.9.6-beta])
 m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-08-05 11:00:57 UTC (rev 870)
+++ trunk/packages/packages.current	2008-08-06 07:36:26 UTC (rev 871)
@@ -229,13 +229,13 @@
 #
 # GpgOL
 #
-#server ftp://ftp.g10code.com/g10code/gpgol/alpha
+server ftp://ftp.g10code.com/g10code/gpgol/alpha
 
-#file gpgol-0.10.14.tar.bz2
-#chk  79a44c9b4eb6ca996ef26659255e4dd86af03b80
-server ftp://ftp.g10code.com/g10code/scratch
-file gpgol-0.10.15-svn260.tar.bz2
-chk 4449a5c004fc38a45c57a6c96c04ed5d2db6dcbb  
+file gpgol-0.10.15.tar.bz2
+chk  0dd28112046fd69d9ca2108c0fda7a835cb3c569
+#server ftp://ftp.g10code.com/g10code/scratch
+#file gpgol-0.10.15-svn260.tar.bz2
+#chk 4449a5c004fc38a45c57a6c96c04ed5d2db6dcbb  
 
 #
 # GpgEX

Modified: trunk/src/inst-gpgol.nsi
===================================================================
--- trunk/src/inst-gpgol.nsi	2008-08-05 11:00:57 UTC (rev 870)
+++ trunk/src/inst-gpgol.nsi	2008-08-06 07:36:26 UTC (rev 871)
@@ -47,6 +47,10 @@
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
   File ${prefix}/share/locale/de/LC_MESSAGES/gpgol.mo
 
+  SetOutPath "$INSTDIR\share\gpgol"
+  File "${prefix}/share/gpgol/*.cfg"
+  File "${prefix}/share/gpgol/*.ico"
+
   SetOutPath "$INSTDIR\share\doc\gpgol"
   File "${bdir}/doc/gpgol.pdf"
 

Modified: trunk/src/uninst-gpgol.nsi
===================================================================
--- trunk/src/uninst-gpgol.nsi	2008-08-05 11:00:57 UTC (rev 870)
+++ trunk/src/uninst-gpgol.nsi	2008-08-06 07:36:26 UTC (rev 871)
@@ -30,6 +30,10 @@
   Call un.SourceDelete
 !else
 
+  Delete "$INSTDIR\share\gpgol\*.cfg"
+  Delete "$INSTDIR\share\gpgol\*.ico"
+  RMDir "$INSTDIR\share\gpgol"
+
   Delete "$INSTDIR\share\doc\gpgol\gpgol.pdf"
   RMDir "$INSTDIR\share\doc\gpgol"
   RMDir "$INSTDIR\share\doc"