bump version, requires

2004-12-20  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version, requires

svn path=/trunk/; revision=28158

4 files changed, 169 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 29fc4c6e01..dcce821956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-20  JP Rosevear  <jpr@novell.com>
+
+	* configure.in: bump version, requires
+
 2004-12-14  JP Rosevear  <jpr@novell.com>
 
 	Fixes #6066
diff --git a/INSTALL b/INSTALL
index b42a17ac46..54caf7c190 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,9 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
 Basic Installation
 ==================
 
@@ -8,20 +14,27 @@ various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
@@ -55,14 +68,16 @@ Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
 
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
@@ -75,11 +90,11 @@ directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
 
 Installation Names
 ==================
@@ -122,22 +137,32 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
      CPU-COMPANY-SYSTEM
 
-See the file `config.sub' for the possible values of each field.  If
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.
 
-   If you are building compiler tools for cross-compiling, you can also
+   If you are _building_ compiler tools for cross-compiling, you should
 use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
 Sharing Defaults
 ================
@@ -150,20 +175,44 @@ default values for variables like `CC', `cache_file', and `prefix'.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 
-Operation Controls
+Defining Variables
 ==================
 
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
    `configure' recognizes the following options to control how it
 operates.
 
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
 `--help'
+`-h'
      Print a summary of the options to `configure', and exit.
 
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
 `--quiet'
 `--silent'
 `-q'
@@ -175,8 +224,6 @@ operates.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
 
-`configure' also accepts some other, not widely useful, options.
diff --git a/NEWS b/NEWS
index 5b97946d50..aa48c4d79c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,76 @@
+Evolution 2.1.2, 2004-12-20
+----------------------------
+
+Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
+
+ * Mail
+
+   #68759 - Evolution Shell can't load modules (JP)
+   #69579 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Michael)
+   #69339 - postscript and some other attachments not visable (Michael)
+   #69579 - vFolders#UNMATCHED generates errors (Michael)
+   #68958 - current message forgotten in vfolders (Michael)
+   #69446 - Mail shown as attachment if some headers are upper case (Michael)
+   #46229 - Filters dialog - label suggestions (Diego Sevilla Ruiz)
+
+ * Calendar
+
+   #47535 - Snooze Time "minutes" string Improperly marked for translation
+    (Rodney)
+   #67403 - wrong alarm time displayed (Rodrigo)
+
+ * Shell
+
+   #61065 - Evolution should be spelled with uppercase E in evolution message (Joan Sanfeliu) 
+
+Other bugs
+
+ * Address Book
+
+    - Turkish locale fixes (S. Caglar Onur)
+    - Set proper window title for editing addressbook properties (Vivek)
+    - Prevent null UID from causing weird saving problems (Siva)
+    - a11y fixes (Harry Lu, Hao Sheng)
+
+ * Mail
+
+    - Add mnemonics everywhere (Mengjie Yu)
+    - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek)
+		
+ * Calendar
+
+    - let users set a template for fetching free/busy information (James
+      Bowes)
+    - Set proper window title for editing calendar/task properties (Vivek)
+    - Leak fixes (Harish)
+    - Fix 64 bit problem (David Mosberger)
+    - UI Fixes for meetings and assigned tasks (Chen)
+
+ * Shell
+
+    - fix 64 bit problem (David Mosberger)
+    - use new window icon (Rodney)
+
+  * Plugins
+
+    - make plugin hooks available for mail even when the mailer is not
+    activated (Michael)
+    - move groupwise config code to a plugin (Siva)
+    - support csv and rdf calendar saving (Philip Van Hoof)   
+
+Updated translations:
+
+  - nl (Vincent van Adrighem)
+  - sv (Christian Rose)
+  - ca (Jordi Mallach)
+  - zh_CN (Funda Wang)
+  - bg (Alexander Shopov)
+  - fi (Ilkka Tuohela)
+  - da (Martin Willemoes Hansen)
+  - tr (Baris Cicek)
+  - lt (Zygimantas Berucka)
+  - cy (Dafydd Harries)
+
 Evolution 2.1.1, 2004-11-28
 ----------------------------
 
diff --git a/configure.in b/configure.in
index d35cefe0c9..10bb48e668 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 2.1.1, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.1.2, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -1100,9 +1100,9 @@ dnl --- Required version numbers
 
 GAL_REQUIRED=2.3.1
 GAL_PACKAGE=2.4
-GTKHTML_REQUIRED=3.5.1
+GTKHTML_REQUIRED=3.5.2
 GTKHTML_PACKAGE=3.6
-EDS_REQUIRED=1.1.1
+EDS_REQUIRED=1.1.2
 EDS_PACKAGE=1.2
 BONOBOUI_REQUIRED=2.4.2