[Gpg4win-commits] r404 - in trunk: . doc doc/manual packages src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu May 24 19:15:17 CEST 2007


Author: werner
Date: 2007-05-24 19:15:17 +0200 (Thu, 24 May 2007)
New Revision: 404

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/configure.ac
   trunk/doc/ChangeLog
   trunk/doc/manual/Makefile.am
   trunk/doc/manual/durchblicker.tex
   trunk/doc/manual/einsteiger.tex
   trunk/doc/manual/novices.tex
   trunk/packages/packages.current
   trunk/src/gpgwrap.c
Log:
Preparing a release


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/ChangeLog	2007-05-24 17:15:17 UTC (rev 404)
@@ -1,3 +1,10 @@
+2007-05-24  Werner Koch  <wk at g10code.com>
+
+	Released 1.1.0.
+
+	* configure.ac (PREVIEWHOST): New. 
+	(MANUALVERSION_NOVICES): Set to 1.0.0.
+
 2007-05-20  Marcus Brinkmann  <marcus at g10code.de>
 
 	* patches/glib-2.12.12/01-giowin32.patch,
@@ -17,6 +24,11 @@
 
 	* packages/download.sh: Require bash due to brace expansion.
 
+2007-05-18  Werner Koch  <wk at g10code.com>
+
+	* src/gpgwrap.c (main): Delimit the real path from the version
+	using a semicolon.
+
 2007-05-17  Werner Koch  <wk at g10code.com>
 
 	* src/installer.nsi (AddToPath,RemoveFromPath): New.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/NEWS	2007-05-24 17:15:17 UTC (rev 404)
@@ -3,32 +3,40 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
-Noteworthy changes in version 1.0.10
+Noteworthy changes in version 1.1.0 (2007-05-24)
 ------------------------------------------------
 
 (en) Included Brigitte Hamilton's english translation of the novice's
      manual.
+(de) Brigitte Hamiltons englische Übersetzung des Einsteiger Handbuchs
+     with nun mit installiert.
 
-(en) gpg, gpgv, gpgsplit and gpa are now installed so that they are
-     searched via PATH.
+(en) The programs GPG, GPGV, GPGSPLIT and GPA are now installed so
+     that they are searched via PATH.
+(de) Die Programm GPG, GPGV, GPGSPLIT und GPA werden nun so
+     installiert, daß sie über den PATH gefunden werden.
 
 (en) Updated to the latest stable version of GTK+ libraries (2.10).
+(de) Update der GTK+ Bibliothek auf die aktuelle Version (2.10).
 
+(en) Files may now be dropped on GPA's file manager window.
+(de) Dateien können nun per Drag&Drop in die Dateiverwaltung von GPA
+     gezogen werden
 
+
 ~~~~~~~~~~~~~~~
 GnuPG: 1.4.7
-GPA:   0.7.5
+GPA:   0.7.6
 GPGol: 0.9.91
 GPGee: 1.3.1
 WinPT: 1.2.0
 Sylpheed-Claws: 2.4.0
-Novices:         
+Novices:        1.0.0
 Einsteiger:     2.0.2
 Durchblicker:   2.0.2
 ~~~~~~~~~~~~~~~
 
 
-
 Noteworthy changes in version 1.0.9 (2007-03-09)
 ------------------------------------------------
 

Modified: trunk/README
===================================================================
--- trunk/README	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/README	2007-05-24 17:15:17 UTC (rev 404)
@@ -89,7 +89,7 @@
 
 The entire Gpg4win package is
 
-  Copyright (C) 2005, 2006 g10 Code GmbH
+  Copyright (C) 2005, 2006, 2007 g10 Code GmbH
   
   GPG4Win is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/configure.ac	2007-05-24 17:15:17 UTC (rev 404)
@@ -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.10])
+m4_define([my_version], [1.1.0])
 m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
@@ -39,7 +39,7 @@
 MANUALDATE_EINSTEIGER="30. Mai 2006"
 MANUALVERSION_DURCHBLICKER="2.0.2"
 MANUALDATE_DURCHBLICKER="30. Mai 2006"
-MANUALVERSION_NOVICES="0.9.0"
+MANUALVERSION_NOVICES="1.0.0"
 MANUALDATE_NOVICES="Nov. 30, 2006"
 MANUALVERSION_ADVANCED="0.0.0"
 MANUALDATE_ADVANCED="Nov. 30, 2006"
@@ -87,8 +87,18 @@
 AC_SUBST(BUILD_FILEVERSION)
 
 
+# To test tye manuals using an actual web server, the preview target
+# may be used in doc/manuals.  The default is my (wk) test environment
+# but may be overriden using another preview variable.  PREVIEWHOST is
+# expected to be the target for an rsync command.
+if test -z "$PREVIEWHOST" ; then
+   PREVIEWHOST="vigenere:/var/www/all/preview.gpg4win.org/htdocs/"
+fi
+AC_SUBST(PREVIEWHOST)
+
+
 # For development of this package it is useful to build without
-# creatign the source installer (takes a long time).  This option may
+# creating the source installer (takes a long time).  This option may
 # be used to suppress creation of the source installer.
 AC_ARG_ENABLE(source-installer,
     AC_HELP_STRING([--disable-source-installer],

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/doc/ChangeLog	2007-05-24 17:15:17 UTC (rev 404)
@@ -1,3 +1,16 @@
+2007-05-24  Werner Koch  <wk at g10code.com>
+
+	* manual/Makefile.am (preview): New.
+	(online): Also copy eps_files_png.
+
+	* manual/durchblicker.tex: Don't specify a specific URL for
+	downloading a PDF version.  We can't do that because the Gforge
+	server preprends a semi-random number to the URL.  Did the same
+	for the other manuals.
+
+	* manual/novices.tex (section{History}): Do not translate the
+	title of the 2005 revision
+
 2007-05-19  Marcus Brinkmann  <marcus at g10code.de>
 
 	* manual/Makefile.am: Replace := by =.

Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/doc/manual/Makefile.am	2007-05-24 17:15:17 UTC (rev 404)
@@ -114,10 +114,19 @@
 	rsync -v --exclude='.svn' einsteiger*.html durchblicker*.html \
           novices*.html \
 	  einsteiger.css durchblicker.css \
-	  $(web_png_files) $(png_files) gpg4win-logo.png \
+	  $(web_png_files) $(png_files) $(eps_files_png) gpg4win-logo.png \
 	  $${user}@wald.intevation.org:/gpg4win/htdocs/handbuecher/
 
+preview: webversion
+	set -e; \
+	echo "Rsyncing the HTML manuals to the preview host ..."; \
+	rsync -v --exclude='.svn' einsteiger*.html durchblicker*.html \
+          novices*.html \
+	  einsteiger.css durchblicker.css \
+	  $(web_png_files) $(png_files) $(eps_files_png) gpg4win-logo.png \
+	  ${PREVIEWHOST}/
 
+
 %.eps.bb : %.eps.gz
 	$(ZCAT) `test -f '$<' || echo '$(srcdir)/'`$< \
           | grep '^%%BoundingBox' | head -1 > $@

Modified: trunk/doc/manual/durchblicker.tex
===================================================================
--- trunk/doc/manual/durchblicker.tex	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/doc/manual/durchblicker.tex	2007-05-24 17:15:17 UTC (rev 404)
@@ -49,8 +49,7 @@
 Gpg4win für Durchblicker}
 
 \author{\htmlonly{\xml{p}\small
-Hier \xlink{Download als PDF Version 2.0.2 (1,2 MByte)}{http://wald.intevation.org/frs/download.php/279/gpg4win-fuer-durchblicker-2.0.2.pdf} und
-\xlink{Downloadübersicht alle PDF Versionen}{http://wald.intevation.org/frs/?group_id=11}\xml{br}
+\xlink{Downloadübersicht aller PDF Versionen}{http://wald.intevation.org/frs/?group_id=11}\xml{br}
 Zu \xlink{Gpg4win für Einsteiger}{einsteiger.html}\xml{br}
 Zur \xlink{Gpg4win Homepage}{http://www.gpg4win.de/}\xml{p}
 }%

Modified: trunk/doc/manual/einsteiger.tex
===================================================================
--- trunk/doc/manual/einsteiger.tex	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/doc/manual/einsteiger.tex	2007-05-24 17:15:17 UTC (rev 404)
@@ -41,9 +41,9 @@
 Gpg4win für Einsteiger}
 
 \author{\htmlonly{\xml{p}\small
-Hier \xlink{Download als PDF Version 2.0.2 (0,8 MByte)}{http://wald.intevation.org/frs/download.php/278/gpg4win-fuer-einsteiger-2.0.2.pdf} und
-\xlink{Downloadübersicht alle PDF Versionen}{http://wald.intevation.org/frs/?group_id=11}\xml{br}
+\xlink{Downloadübersicht aller PDF Versionen}{http://wald.intevation.org/frs/?group_id=11}\xml{br}
 Zu \xlink{Gpg4win für Durchblicker}{durchblicker.html}\xml{br}
+Zu \xlink{Englische Version dieses Handbuchs}{novices.html}\xml{br}
 Zur \xlink{Gpg4win Homepage}{http://www.gpg4win.de/}\xml{p}
 }%
 Eine Veröffentlichung des Gpg4win Projekts\\

Modified: trunk/doc/manual/novices.tex
===================================================================
--- trunk/doc/manual/novices.tex	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/doc/manual/novices.tex	2007-05-24 17:15:17 UTC (rev 404)
@@ -40,11 +40,9 @@
 Gpg4win for Novices}
 
 \author{\htmlonly{\xml{p}\small
-%%Here \xlink{Download PDF Version 2.0.1 (1.5
-%MByte)}{http://wald.intevation.org/frs/download.php/203/gpg4win-fuer-einsteiger-2.0.1.pdf} und
-\xlink{List of PDF Download
-Versions}{http://wald.intevation.org/frs/?group_id=11}\xml{br}
-To \xlink{Gpg4win for Advanced Users}{advanced.html}\xml{br}
+\xlink{List of PDF Download Versions}{http://wald.intevation.org/frs/?group_id=11}\xml{br}
+%To \xlink{Gpg4win for Advanced Users}{advanced.html}\xml{br}
+To \xlink{German version of this manual)}{einsteiger.html}\xml{br}
 To \xlink{Gpg4win Homepage}{http://www.gpg4win.org/}\xml{p}
 }%
 A publication of the Gpg4win project\\
@@ -1412,7 +1410,7 @@
 %    Der Abschnitt "History" ist im Originaldokument nicht vorhanden
 %    und wurde von Werner Koch beigefügt.
 \item Revised unpublished version by TextLab text+media.      
-\item "Gpg4win for Beginners", December 2005\\
+\item "Gpg4win für Einsteiger", December 2005\\
       Authors:  Werner Koch, g10 Code GmbH\\
       Published as part of the Gpg4win project.
 \item "Gpg4win for Novices", November 2006\\

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/packages/packages.current	2007-05-24 17:15:17 UTC (rev 404)
@@ -16,7 +16,7 @@
 # delimiter).  The statement "chk" is followed by the SHA1 checksum of
 # the last file.
 #
-# Note: You may use "make upload" to copy this file to is canonical place.
+# Note: You may use "make upload" to copy this file to its canonical place.
 #
 
 #
@@ -228,7 +228,8 @@
 #
 server http://wald.intevation.org/frs/download.php
 
-file 324/gpa-0.7.5.tar.bz2
-chk  b29e2195088418d1ecab5a087fa8b747cdae7b8e
+file 350/gpa-0.7.6.tar.bz2
+chk  bb9182cd4c6bd6677ba9cdcca262dcc1b1d22c3c
 
 
+

Modified: trunk/src/gpgwrap.c
===================================================================
--- trunk/src/gpgwrap.c	2007-05-20 21:15:59 UTC (rev 403)
+++ trunk/src/gpgwrap.c	2007-05-24 17:15:17 UTC (rev 404)
@@ -135,7 +135,7 @@
       && !strcmp(argv[1], "--version")
       && !strcmp(argv[2], "--version"))
     {
-      fputs ("gpgwrap (Gpg4win) " PACKAGE_VERSION " ", stdout);
+      fputs ("gpgwrap (Gpg4win) " PACKAGE_VERSION " ;", stdout);
       fputs (pgm, stdout);
       fputc ('\n', stdout);
       fflush (stdout);



More information about the Gpg4win-commits mailing list