* configure.ac: Bumped version number to 1.9.0-cvs.

4 files changed, 11 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 7595565e1..832ba26ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-10-19  Werner Koch  <wk@gnupg.org>
 
+	* configure.ac: Bumped version number to 1.9.0-cvs.
+
         NewPG (Aegypten project) to GnuPG merge.
 
 2002-09-20  Werner Koch  <wk@gnupg.org>
diff --git a/NEWS b/NEWS
index a2dc8126e..efacfbdd7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,90 +1,11 @@
-Noteworthy changes in version 0.9.3 (unreleased)
+Noteworthy changes in version 1.9.0 (unreleased)
 ------------------------------------------------
 
-
-Noteworthy changes in version 0.9.2 (2002-09-20)
-------------------------------------------------
-
- * The default directory structure is created if it does no exists.
-
- * A few more diagnostics and a minor bug fixes.
-
-
-Noteworthy changes in version 0.9.1 (2002-08-23)
-------------------------------------------------
-
- * Minor fixes.
-
-
-Noteworthy changes in version 0.9.0 (2002-08-21)
-------------------------------------------------
-
- * The default homedir has changed from ~/.gnupg-test to ~/.gnupg.
-
- * To run gpg-agent or scdaemon in the background, the option --daemon
-   must be used.
-
-Noteworthy changes in version 0.3.10 (2002-08-10)
--------------------------------------------------
-
- * A key may be specified by a short fingerprint; either the last 4 or
-   8 bytes of the SHA-1 fingerprint.
-
- * Very basic regression tests implemented.
-
- * Signing using more than one key works on the commandline and in
-   server mode.
-
- * --import does now try to import all certificates up the chain; this
-   usually works only when the new option --auto-issuer-key-retrieve
-   is also used.
-
- * New command --delete-key.  Note that in contrast to gpg this is not
-   interactive.
-
-Noteworthy changes in version 0.3.9 (2002-07-01)
-------------------------------------------------
-
- * The protect-tool does now make use of the gpg-agent to query a
-   passphrase.
-
- * The default path of the daemons are now set to a more common value
-   and there are configure options to change them.
-
-Noteworthy changes in version 0.3.8 (2002-06-25)
-------------------------------------------------
-
- * The protect-tool has now a feature to extract a private RSA key
-   from a PKCS-12 file and convert it into the gpg-agent format.
-
- * A bunch of big fixes and changes for improved interoperability.
-
- * gpgsm can now create non-detached signatures.
-
-Noteworthy changes in version 0.3.7 (2002-06-04)
-------------------------------------------------
-
- * More user friendly output for --list-keys without --with-colons.
-   New --list-sigs to show the certification path.
-
- * gpg-agent handles concurrent connections.
-
- * gpgsm --import can now handle certs-only messages.
-
-Noteworthy changes in version 0.3.6 (2002-05-03)
-------------------------------------------------
-
- * Some cleanups.
-
-Noteworthy changes in version 0.3.5 (2002-04-15)
-------------------------------------------------
- 
- * Checks key usage and uses the authorithyKeyIdentifier.
-
- * Basic SC support for TCOS card using a patched version of OpenSC.
+  * Merged stuff from the newpg branch and started this new
+    development branch.
 
 
- Copyright 2002 g10 Code GmbH
+ Copyright 2002 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/README b/README
index 93dc1c8f0..7796a9436 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-NewPG is a temporary protect to work on GnuPG extensions.  It will be
-merged into the regular GnuPG sources for a GnuPG 2.0 release.
+GnuPG 1.9 is a temporary protect to work on GnuPG extensions.  It will
+eventually lead to a GnuPG 2.0 release.
 
 jnlib/  utility functions
 assuan/ assuan protocol library
diff --git a/configure.ac b/configure.ac
index 8294fb3c4..ac31adf05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# configure.ac - for NewPG
+# configure.ac - for GnuPG
 #       Copyright (C) 2001, 2002 Free Software Foundation, Inc,
 # 
 # This file is part of GnuPG.
@@ -21,7 +21,7 @@
 AC_PREREQ(2.52)
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(newpg, 0.9.3-cvs, gpa-dev@gnupg.org)
+AC_INIT(newpg, 1.9.0-cvs, gpa-dev@gnupg.org)
 NEED_LIBGCRYPT_VERSION=1.1.8
 NEED_KSBA_VERSION=0.4.4
 NEED_OPENSC_VERSION=0.7.0
@@ -30,6 +30,7 @@ ALL_LINGUAS="de"
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
+AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_SRCDIR(sm/gpgsm.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)