bump version

2005-01-11  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version

svn path=/trunk/; revision=28357

4 files changed, 86 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index f700896691..f832222df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-11  JP Rosevear  <jpr@novell.com>
+
+	* configure.in: bump version
+
 2005-01-11  Not Zed  <NotZed@Ximian.com>
 
 	* configure.in: added new mail plugin & checks.
diff --git a/NEWS b/NEWS
index aa48c4d79c..cfe0edf061 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,78 @@
+Evolution 2.1.3, 2004-01-10
+----------------------------
+
+Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):
+
+ * Calendar
+
+   #69663 - Task list on the web does not mark tasks as finished (JP)
+   #61076 - Evolution calendar messages unnecessarily marked for translation (JP)
+   #41624 - only the last exception is deleted on palm device (JP)
+
+ * Addressbook
+
+   #61068 - Extraneous space in evolution message (Andre Klapper)
+   #61975 - Can't translate string "Reflow test" (JP)
+
+ * Plugins
+
+   #30992 - Preferences dialog greys out OK button after Apply (JP)
+
+Other bugs
+
+ * Address Book
+
+    - set read only state better for contact editor (Hans)
+    - add UI for marking calendars offline (Siva)
+    - use new name selector api (Hans)
+
+ * Mail
+
+    - Display icon for shared folder (Vivek)
+    - New offline folder/store classes (Jeff)
+    - Handle reply in mailto: (Michael)
+    - a11y fixes (Mengjie Yu)
+    -  (Mengjie Yu)
+		
+ * Calendar
+
+    - detached instance recurrence handling (Rodrigo)
+    - calendar attachments (Harish)
+    - send options for meeting (Chen)
+    - handle calendar:// uris (JP)
+    - handle different calendars having the same uid (Rodrigo)
+    - add UI for marking calendars offline (Chen)
+    - use new name selector API (Hans)
+    - prevent crash when searching for f/b info (JP)
+    - a11y fixes (Harry)
+    - calendar config cleanup (JP)
+	
+ * Shell
+
+    - Make component buttons configurable (JP)
+    - Set offline with gconf key (Siva)
+
+  * Plugins
+
+    - add component.migration event for calendar (David Trowbridge)
+    - fix translations of popup menus (Michael)
+    - HIG config dialog fixes (Rodney)
+    - Add calendar file config plugin so local calendar get set up right (JP)
+    - Add calendar weather config plugin (David Trowbridge)
+    - Add exchange account config plugin (Sushma)
+    - Add groupwise send options plugin (Partha)
+    - Add itip formatter plugin (JP)
+    - Add new-mail-notify plugin that uses DBUS (Miguel Angel Lopez Hernandez)
+    - Use standard error messages in save-calendar plugin (Philip Van Hoof)
+    - Add send options plugin for account editor (Chen)
+    - Add shared folder notification plugin (vivek)
+
+Updated translations:
+  - lt (Zygimantas Berucka)
+  - ja (Takeshi AIHANA)
+  - bg (Vladimir Petkov, Alexander Shopov)
+  - et (Priit Laes, Ivar Smolin)
+
 Evolution 2.1.2, 2004-12-20
 ----------------------------
 
diff --git a/configure.in b/configure.in
index a998f4b20c..dca92de97e 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.2, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.1.3, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -1098,11 +1098,11 @@ fi
 
 dnl --- Required version numbers
 
-GAL_REQUIRED=2.3.1
+GAL_REQUIRED=2.3.2
 GAL_PACKAGE=2.4
-GTKHTML_REQUIRED=3.5.2
+GTKHTML_REQUIRED=3.5.3
 GTKHTML_PACKAGE=3.6
-EDS_REQUIRED=1.1.2
+EDS_REQUIRED=1.1.3
 EDS_PACKAGE=1.2
 BONOBOUI_REQUIRED=2.4.2
 
diff --git a/plugins/shared-folder/Makefile.am b/plugins/shared-folder/Makefile.am
index 539844fe2a..a26f07aa6c 100644
--- a/plugins/shared-folder/Makefile.am
+++ b/plugins/shared-folder/Makefile.am
@@ -11,13 +11,11 @@ plugin_DATA = org-gnome-shared-folder.eplug
 plugin_LTLIBRARIES = liborg-gnome-shared-folder.la
 
 liborg_gnome_shared_folder_la_SOURCES = share-folder-common.c share-folder.c install-shared.c share-folder.h 
-liborg_gnome_shared_folder_la_LIBADD= $(prefix)/lib/libegroupwise-1.2.la
+liborg_gnome_shared_folder_la_LIBADD= $(CAMEL_GROUPWISE_LIBS)
 
 
 liborg_gnome_shared_folder_la_LDFLAGS = -module -avoid-version
 
- glade_DATA =properties.glade 
+glade_DATA =properties.glade 
 
-
-
-EXTRA_DIST =$(glade_DATA)
+EXTRA_DIST = $(glade_DATA) org-gnome-shared-folder.eplug.in