[Gpg4win-commits] r1393 - in trunk: . doc doc/website

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2010-04-16 16:27:36 +0200 (Fri, 16 Apr 2010)
New Revision: 1393

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/doc/ChangeLog
   trunk/doc/website/Makefile.am
Log:
Added 2.0.2 changes (r1384) to trunk

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-16 12:25:50 UTC (rev 1392)
+++ trunk/ChangeLog	2010-04-16 14:27:36 UTC (rev 1393)
@@ -37,7 +37,7 @@
 
 	* configure.ac (IS_BETA_BUILD): New.
 	(RELEASEHOST): New.
-	* src/gpg4win.mk (README.$(1).txt): Repalce egrep by IS_BETA_BUILD.
+	* src/gpg4win.mk (README.$(1).txt): Replace egrep by IS_BETA_BUILD.
 
 2010-03-16  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-04-16 12:25:50 UTC (rev 1392)
+++ trunk/configure.ac	2010-04-16 14:27:36 UTC (rev 1393)
@@ -1,5 +1,5 @@
 # configure.ac for GPG4Win
-# Copyright (C) 2005, 2006, 2007, 2008 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007, 2008, 2010 g10 Code GmbH
 # 
 # This file is part of GPG4Win
 # 

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2010-04-16 12:25:50 UTC (rev 1392)
+++ trunk/doc/ChangeLog	2010-04-16 14:27:36 UTC (rev 1393)
@@ -1,17 +1,20 @@
+2010-04-12  Werner Koch  <wk at g10code.com>
+
+	* website/Makefile.am (EXTRA_DIST): Fix newsarchive names.
+
 2010-04-12  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 	
-	* README.ar.txt, README.de.txt, README.en.txt, 
-	  README.es.txt, README.fr.txt,  README.ru.txt:
-	  Update for 2.0.2.
+	* README.ar.txt, README.de.txt, README.en.txt, README.es.txt
+	* README.fr.txt, README.ru.txt: Update for 2.0.2.
 
 2010-04-01  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
-	* website/index.htm4, website/index-de.htm4,
-	  website/documentation.htm4, website/documentation-de.htm4,
-	  website/versions.m4: Change compendium version. Add news.
+	* website/index.htm4, website/index-de.htm4
+	* website/documentation.htm4, website/documentation-de.htm4
+	* website/versions.m4: Change compendium version. Add news.
 
-	* website/newsarchive.htm4, website/newsarchive-de.htm4,
-	  website/Makefile.am: Add news archive.
+	* website/newsarchive.htm4, website/newsarchive-de.htm4
+	* website/Makefile.am: Add news archive.
 
 	* manual/gpg4win-compendium-de.tex: Fixed typos. Added gpgme debug
 	section. Some minor changes.

Modified: trunk/doc/website/Makefile.am
===================================================================
--- trunk/doc/website/Makefile.am	2010-04-16 12:25:50 UTC (rev 1392)
+++ trunk/doc/website/Makefile.am	2010-04-16 14:27:36 UTC (rev 1393)
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 EXTRA_DIST = README buildhtml.mk gpg4win.css index-de.htm4 index.htm4 \
-             newsarchive.m4 newsarchive-de.m4 \
+             newsarchive.htm4 newsarchive-de.htm4 \
              template.m4 template_header.m4 versions.m4 build-history.awk \
              pix/disk.png pix/lock.png pix/logo.png mk-chksums NEWS.last