Fix make distcheck issues. Bump version number ***** Release 2.3.6 *****

2005-07-26  Harish Krishnaswamy  <kharish@novell.com>

* plugins/calendar-weather/Makefile.am:
* plugins/groupwise-features/Makefile.am:
* plugins/mail-account-disable/Makefile.am:
* plugins/mailing-list-actions/Makefile.am:
* plugins/print-message/Makefile.am:
 Fix make distcheck issues.
* configure.in: Bump version number
***** Release 2.3.6 *****

svn path=/trunk/; revision=29892

8 files changed, 111 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b91b50882..447bb300e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
+
+	* plugins/calendar-weather/Makefile.am:
+	* plugins/groupwise-features/Makefile.am:
+	* plugins/mail-account-disable/Makefile.am:
+	* plugins/mailing-list-actions/Makefile.am:
+	* plugins/print-message/Makefile.am: Fix make distcheck issues.
+
+	* configure.in: Bump version number
+	***** Release 2.3.6 *****
+
 2005-07-20  Tor Lillqvist  <tml@novell.com>
 
 	* configure.in: Add AC_LIBTOOL_WIN32_DLL. It is apparently
diff --git a/NEWS b/NEWS
index db5d3d9662..b1358585f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,95 @@
+Evolution 2.3.6 2005-07-26
+---------------------------
+
+Bugzilla bugs fixed (see http://bugzilla.gnome.org/show_bug.cgi):
+
+	#248126 - Missing options from Task menubar (Viren)
+	#219242 - Save draft shortcut and button (Devashish)
+	#310136 - number of mails in a folder using accessibility interface
+	          (Li Yuan)
+	#310138 - locate first mail in a message list tree using 
+	          accessibility interface (Li Yuan)
+	#310330 - forwarding a mail as inline/quoted makes evolution 
+	          disappear (Vivek)
+	#216021 - Add confirmation dialog to Forget Password (Sankar)
+	#309991 - PROXY: Appointments not shown in proper time-zone (Chenthill)
+	#310985 - "Subscribe to other user's Folder" option should be moved 
+	          to File menu (Shakti)
+	#309602 - Un-accepted GroupWise Appointments Should Give 
+	          Cue On Calendar (Chenthill)
+	#245331 - Keybindings for switching b/w calendar views (Harish)
+	#310340 - 'Delete This Occurence' does not delete that occurence 
+	          in GW calendar (Chenthill)
+	#309680 - "Make this Occurence Movable" for a recurring appointment 
+	          crashes evolution (Chenthill)
+	#309869 - Clicking on buttons in composer doesnt change focus 
+	          to the corresponding fields (Antony)
+	#257329 - autocompletion in the settings uses wrong icon (Sushma)
+	#235830 - Contacts name not displayed during edits (Arunprakash)
+	#311090 - Cut contact asking for confirmation (Sushma)
+	#310343 - Copying contact to same folder - Evolution crashes (Arunprakash)
+	#311096 - Not able to add any user to give permissions (Shakti)
+	#310433 - Renaming a user created Tasks List under exchange account 
+	          creates one more Tasks List (Praveen)
+	#310837 - Folder Permissions' doesn't show the 'Custom' label in the 
+	          'Role' combo box  (Shakti) 	 
+	#310699 - Evolution crashes after viewing the all folders' size (Sarfraaz)
+	#310479 - For exchange calendar 'Permission' option is missing (Shakti)
+	#310493 - Checking any Mail folder permission crashes evolution (Shakti)
+	#310369 - No dialog pops up when you click on Folder->Subscribe (Shakti)
+	#310233 - Evolution crashes when no exchange-account is configured  (Shakti)
+	#310854 - settings message receipts in send options does not send any message (Vivek)
+	#310347 - trying to enable/disable filters for a mail account when the 
+	          account is disabled hangs/crashes evolution (Vivek)
+	#309992 - PROXY: Contacts button not disabled in edit-proxy-access-rights (Vivek)
+	
+Other fixes and changes :
+
+	- fix make distcheck woes all over the module (Harish)
+	- refactor mail refresh code (Michael)
+	- revert broken view->hide menu (Michael) 
+	- attachment bar cleanup (Srinivasa)
+	- mailer memory leak fixes (Kjartan Maraas, Shreyas)
+	- do not enter sidebar button in shell window when there
+	  is no label (Sarfraaz)
+	- Build fixes for Windows support and use of NO_UNDEFINED
+	  (Tor Lillqvist)
+	- Image resize in contact-editor (Srinivasa)
+	- enhance ESendOptionsDialog ui (Vivek)
+	- allow user added categories to be edited and disable
+	  editing on builtin views on etable (Srinivasa)
+	- calendar/contact/task hooks for exchange-operations plugin
+	  (Shakti)
+	- fix error calls in exchange (Arunprakash)
+	- exchange folder size display (Sarfraaz)
+	- mark GW System Addressbook for offline usage by default (Sushma)
+	- consolidate proxy plugins into groupwise features (Sankar)
+	- fix memory leak in itip-formatter (Chenthill)
+	
+
+Updated Translations:
+
+	- bg (Vladimir Petkov)
+	- el (Nikos Charonitakis)
+	- en_CA (Adam Weinberger)
+	- es (Francisco Javier F. Serrador)
+	- et (Ivar Smolin)
+	- fi (Ilkka Tuohela)
+	- ja (Takeshi AIHANA)
+	- lt (Žygimantas Beručka)
+	- nb, no (Kjartan Maraas)
+	- nl (Tino Meinen)
+	- POTFILES (Adam Weinberger)
+	- POTFILES (Sankar P)
+	- POTFILES (Sarfraaz Ahmed)
+	- POTFILES (Shakti Sen)
+	- POTFILES (Vivek Jain)
+	- pt_BR (Raphael Higino)
+	- sk (Marcel Telka)
+	- sr, sr@Latn (Igor Nestorović)
+	- vi (Clytie Siddall)
+	- zh_CN (Funda Wang)
+
 Evolution 2.3.5 2005-07-12
 ---------------------------
 
diff --git a/configure.in b/configure.in
index e0f8a7b8e8..58449ed6da 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.3.5.1, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.3.6, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 598521073b..8f57db1dcc 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -2,7 +2,8 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2`
 weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather
 
 INCLUDES =									\
-	-I$(top_srcdir)/shell							\
+	-I$(top_srcdir)								\
+	-I$(top_builddir)/shell							\
 	$(EVOLUTION_CALENDAR_CFLAGS)						\
 	$(SOURCE_SEL_CFLAGS)							\
 	-DWEATHER_DATADIR=\""$(weatherdatadir)"\"				\
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 6cc7df0ecc..f06792bfe5 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =						\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_srcdir)/camel                           \
+	-I$(top_builddir)/composer                      \
+	-I$(top_builddir)/mail                          \
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am
index b1bae11247..bd29208a2e 100644
--- a/plugins/mail-account-disable/Makefile.am
+++ b/plugins/mail-account-disable/Makefile.am
@@ -7,6 +7,7 @@ endif
 
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)/mail				\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
 
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 7156516615..72bbd70660 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)/composer 			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
diff --git a/plugins/print-message/Makefile.am b/plugins/print-message/Makefile.am
index 7b46d27c88..ad4f7f8dd7 100644
--- a/plugins/print-message/Makefile.am
+++ b/plugins/print-message/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)/composer                      \
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@