Added 2.0.2 changes (r1384) to trunk
authorEmanuel Schuetze <emanuel.schuetze@intevation.de>
Fri, 16 Apr 2010 14:27:36 +0000 (14:27 +0000)
committerEmanuel Schuetze <emanuel.schuetze@intevation.de>
Fri, 16 Apr 2010 14:27:36 +0000 (14:27 +0000)
ChangeLog
configure.ac
doc/ChangeLog
doc/website/Makefile.am

index ffa71d0..249d8df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@intevation.de>
 
index 76fa2f0..7a89dcf 100644 (file)
@@ -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
 # 
index de53026..c0cf0aa 100644 (file)
@@ -1,17 +1,20 @@
+2010-04-12  Werner Koch  <wk@g10code.com>
+
+       * website/Makefile.am (EXTRA_DIST): Fix newsarchive names.
+
 2010-04-12  Emanuel Schuetze  <emanuel.schuetze@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@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.
index 9456c3c..69f4b51 100644 (file)
@@ -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