[Gpg4win-commits] r328 - in trunk: . packages patches patches/gnupg-1.4.4 src

Tue Jul 25 10:34:58 CEST 2006

Author: werner
Date: 2006-07-25 10:34:58 +0200 (Tue, 25 Jul 2006)
New Revision: 328

Added:
   trunk/patches/gnupg-1.4.4/
   trunk/patches/gnupg-1.4.4/01-reopen-std.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/src/inst-sections.nsi
   trunk/src/inst-sylpheed-claws.nsi
   trunk/src/installer-finish.nsi
   trunk/src/uninst-gpg4win.nsi
Log:
getting ready for a release


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

--- trunk/ChangeLog	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/ChangeLog	2006-07-25 08:34:58 UTC (rev 328)
@@ -1,3 +1,13 @@
+2006-07-25  Werner Koch  <wk at g10code.com>
+
+	Released 1.0.4.
+
+	* src/installer-finish.nsi: Delete Sylpheed manual.
+
+	* patches/gnupg-1.4.4/01-reopen-std.patch: New. 
+	* Makefile.am (EXTRA_DIST): Add new patch and removed old 1.4.2
+	patch.
+
 2006-07-22  Timo Schulz  <twoaday at g10code.de>
 
 	* Makefile.am: Added new sylpheed patches.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/Makefile.am	2006-07-25 08:34:58 UTC (rev 328)
@@ -24,7 +24,7 @@
 SUBDIRS = packages include doc src
 
 EXTRA_DIST = autogen.sh README.SVN \
-	patches/gnupg-1.4.2/01-po-subdirs.patch \
+	patches/gnupg-1.4.4/01-reopen-std.patch \
 	patches/gpgme-1.1.0/01-gpgme-def.patch \
 	patches/gpgme-1.1.0/02-libtool-dll.patch \
         patches/pthreads-w32-2-7-0-release/01-make.patch \

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/NEWS	2006-07-25 08:34:58 UTC (rev 328)
@@ -3,6 +3,30 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
+Noteworthy changes in version 1.0.4 (2006-07-25)
+------------------------------------------------
+
+(en)Changed GnuPG to again allow working with certain frontends.
+(de)GnuPG wurde geändert, so daß einige Frontends wieder
+    funktionieren.
+
+(en)Added icons to GPA and Sylpheed-Claws.
+(de)Icons werden nun für GPA und Sylpheed-Claws angezeigt.
+
+(en)Install an English manual for Sylpheed-Claws.
+(de)Ein englisches Handbuch zu Sylpheed-Claws wird nun installiert.
+
+~~~~~~~~~~~~~~~
+GnuPG: 1.4.4
+WinPT: 0.12.3
+GPA:   0.7.4
+GPGol: 0.9.10
+GPGee: 1.3.1
+Sylpheed-Claws: 2.3.1
+Einsteiger:     2.0.2
+Durchblicker:   2.0.2
+~~~~~~~~~~~~~~~
+
 Noteworthy changes in version 1.0.3 (2006-06-26)
 ------------------------------------------------
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/configure.ac	2006-07-25 08:34:58 UTC (rev 328)
@@ -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.0.3])
+m4_define([my_version], [1.0.4])
 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	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/packages/packages.current	2006-07-25 08:34:58 UTC (rev 328)
@@ -181,10 +181,12 @@
 
 server http://wald.intevation.org/frs/download.php
 
-file 151/gpa-0.7.3.tar.bz2
-chk  829871ad5c4c41e12cc4097af0e02e86c66efcab
+file 241/gpa-0.7.4.tar.bz2
+chk  f2bdfb3ce5e6e7f6ce7530d214dd2202ab6a2072
 
 
 
 
 
+
+

Added: trunk/patches/gnupg-1.4.4/01-reopen-std.patch
===================================================================
--- trunk/patches/gnupg-1.4.4/01-reopen-std.patch	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/patches/gnupg-1.4.4/01-reopen-std.patch	2006-07-25 08:34:58 UTC (rev 328)
@@ -0,0 +1,33 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Fix a problem when used by faulty Windows software.
+
+
+2006-06-27  Werner Koch  <wk at g10code.com>
+
+	* gpg.c (reopen_std) [HAVE_W32_SYSTEM]: Do not use it.
+
+
+--- g10/gpg.c~  2006-06-25 12:58:40.000000000 +0200
++++ g10/gpg.c   2006-07-25 09:23:20.000000000 +0200
+@@ -1631,7 +1631,7 @@ parse_trust_model(const char *model)
+ static void
+ reopen_std(void)
+ {  
+-#ifdef HAVE_STAT
++#if defined(HAVE_STAT) && !defined(HAVE_W32_SYSTEM)
+   struct stat statbuf;
+   int did_stdin=0,did_stdout=0,did_stderr=0;
+   FILE *complain;
+@@ -1685,7 +1685,7 @@ reopen_std(void)
+ 
+   if(did_stdin==2 || did_stdout==2 || did_stderr==2)
+     exit(3);
+-#endif
++#endif /* HAVE_STAT && !HAVE_W32_SYSTEM */
+ }
+ 
+ int
+

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/src/inst-sections.nsi	2006-07-25 08:34:58 UTC (rev 328)
@@ -500,7 +500,7 @@
 	"$INSTDIR\sylpheed-claws.exe" \
         "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_sylpheed)
 !ifndef GPG4WIN_LIGHT
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Sylpheed Claws Manual.lnk" \
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Sylpheed-Claws Manual.lnk" \
 	"$INSTDIR\sylpheed-claws-manual.pdf" \
 	"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_sylpheed_pdf)
 !endif

Modified: trunk/src/inst-sylpheed-claws.nsi
===================================================================
--- trunk/src/inst-sylpheed-claws.nsi	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/src/inst-sylpheed-claws.nsi	2006-07-25 08:34:58 UTC (rev 328)
@@ -52,7 +52,7 @@
    "Sylpheed-Claws Mail-User-Agent"
 LangString DESC_SEC_sylpheed ${LANG_GERMAN} \
    "Sylpheed-Claws ist ein vollständiges Mail- und News-Programm mit sehr \
-    guter Unterstützung für GnuPG.  Dies ist die Sylpheed-Claws Variante."
+    guter Unterstützung für GnuPG."
 
 LangString DESC_Menu_sylpheed ${LANG_ENGLISH} \
    "Run the Sylpheed-Claws mailprogram."

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/src/installer-finish.nsi	2006-07-25 08:34:58 UTC (rev 328)
@@ -72,6 +72,7 @@
 !endif
 !ifdef HAVE_PKG_SYLPHEED_CLAWS
   Delete "$DESKTOP\Sylpheed-Claws.lnk"
+  Delete "$DESKTOP\Sylpheed-Claws Manual.lnk" \
   # We better delete also the name we used prior to 1.0.3
   Delete "$DESKTOP\Sylpheed.lnk"
 !endif

Modified: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi	2006-07-22 15:02:49 UTC (rev 327)
+++ trunk/src/uninst-gpg4win.nsi	2006-07-25 08:34:58 UTC (rev 328)
@@ -37,7 +37,7 @@
 
   RMDir "$INSTDIR\share\gpg4win"
 
-  # Try to remove otehr top directories.
+  # Try to remove other top directories.
   RMDir "$INSTDIR\lib"
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR"

