[Gpg4win-commits] r1331 - in trunk: . doc src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Feb 2 15:20:48 CET 2010 

Author: werner
Date: 2010-02-02 15:20:46 +0100 (Tue, 02 Feb 2010)
New Revision: 1331

Added:
   trunk/doc/beta-warning.txt
Modified:
   trunk/ChangeLog
   trunk/doc/ChangeLog
   trunk/doc/Makefile.am
   trunk/doc/README.ar.txt
   trunk/doc/README.de.txt
   trunk/doc/README.en.txt
   trunk/doc/README.es.txt
   trunk/doc/README.fr.txt
   trunk/doc/README.ru.txt
   trunk/src/gpg4win.mk.in
Log:
Automagically add a BETA warning if the version number includes 
one of the substrings "svn", "rc" or "beta".


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/ChangeLog	2010-02-02 14:20:46 UTC (rev 1331)
@@ -1,3 +1,7 @@
+2010-02-02  Werner Koch  <wk at g10code.com>
+
+	* src/gpg4win.mk.in (README.$(1).txt): Implement beta-warning hack.
+
 2010-02-01  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* NEWS: Update claws and kleaopatra.

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/ChangeLog	2010-02-02 14:20:46 UTC (rev 1331)
@@ -1,3 +1,8 @@
+2010-02-02  Werner Koch  <wk at g10code.com>
+
+	* beta-warning.txt: New.
+	* README.en.txt, README.de.txt: Add Beta warning tag.
+
 2010-02-01  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
  
 	 * logo/gpg4win-nsis-wizard-uninstall-164x314.bmp: Update image.

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/Makefile.am	2010-02-02 14:20:46 UTC (rev 1331)
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-EXTRA_DIST = nsi-mode.el pkg-copyright.txt \
+EXTRA_DIST = nsi-mode.el pkg-copyright.txt beta-warning.txt \
 	     README.ar.txt README.de.txt README.en.txt README.es.txt \
 	     README.fr.txt README.ru.txt
 

Modified: trunk/doc/README.ar.txt
===================================================================
--- trunk/doc/README.ar.txt	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/README.ar.txt	2010-02-02 14:20:46 UTC (rev 1331)
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into Arabic!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

Modified: trunk/doc/README.de.txt
===================================================================
--- trunk/doc/README.de.txt	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/README.de.txt	2010-02-02 14:20:46 UTC (rev 1331)
@@ -7,7 +7,7 @@
 
                   Deutsche README Datei für Gpg4win
                   =================================
-
+!BETA-WARNING!
 Dies ist Gpg4win, Version !VERSION!.
 
 Inhalt:

Modified: trunk/doc/README.en.txt
===================================================================
--- trunk/doc/README.en.txt	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/README.en.txt	2010-02-02 14:20:46 UTC (rev 1331)
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 This is Gpg4win, version !VERSION!.
 
 Content:

Modified: trunk/doc/README.es.txt
===================================================================
--- trunk/doc/README.es.txt	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/README.es.txt	2010-02-02 14:20:46 UTC (rev 1331)
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into Spanish!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

Modified: trunk/doc/README.fr.txt
===================================================================
--- trunk/doc/README.fr.txt	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/README.fr.txt	2010-02-02 14:20:46 UTC (rev 1331)
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into French!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

Modified: trunk/doc/README.ru.txt
===================================================================
--- trunk/doc/README.ru.txt	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/README.ru.txt	2010-02-02 14:20:46 UTC (rev 1331)
@@ -6,7 +6,7 @@
 
                    English README file for Gpg4win
                    ===============================
-
+!BETA-WARNING!
 +++ You are welcome to translate this file into Russian!
 Please contact the Gpg4win developer mailing list for contributing
 and look at http://gpg4win.de/localize-gpg4win.html +++

Added: trunk/doc/beta-warning.txt
===================================================================
--- trunk/doc/beta-warning.txt	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/doc/beta-warning.txt	2010-02-02 14:20:46 UTC (rev 1331)
@@ -0,0 +1,10 @@
+
+   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   Attention: This is a BETA version of Gpg4win.  This means, some
+   functionalities might be missing or NOT WORKING CORRECTLY.
+
+   Beta versions are intended for testing by experienced users or
+   administrators to learn about the upcoming version and to suggest
+   changes.  They should not be used in a production environment.
+   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2010-02-01 16:04:49 UTC (rev 1330)
+++ trunk/src/gpg4win.mk.in	2010-02-02 14:20:46 UTC (rev 1331)
@@ -310,16 +310,20 @@
 # Template for README files
 
 define README_template
-README.$(1).txt : versioninfo.txt NEWS.tmp $(top_srcdir)/doc/README.$(1).txt
+README.$(1).txt : versioninfo.txt NEWS.tmp $(top_srcdir)/doc/README.$(1).txt \
+                  $(top_srcdir)/doc/beta-warning.txt
 	sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
 	-e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
+	-e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
         -e '/!PKG-COPYRIGHT!/{r $(top_srcdir)/doc/pkg-copyright.txt' -e 'd;}' \
         -e 's,!VERSION!,$(VERSION),g' \
 	   < $(top_srcdir)/doc/README.$(1).txt \
+	   | (if echo "$(VERSION)" | egrep 'svn|rc|beta' >/dev/null; then \
+              sed -e '/!BETA-WARNING!/{r $(top_srcdir)/doc/beta-warning.txt' \
+               -e 'd;}'; else sed -e 's,!BETA-WARNING!,,g'; fi) \
            | awk '{printf "%s\r\n", $$$$0}' >README.$(1).txt
 endef
 
-
 # Insert the template for each source package.
 $(foreach spkg, $(gpg4win_spkgs), $(eval $(call SPKG_template,$(spkg))))

More information about the Gpg4win-commits mailing list