aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@src.gnome.org>2005-06-16 21:37:37 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2005-06-16 21:37:37 +0800
commit1565f9f382208eecb89e9a5e5c86f2ae4d9838d9 (patch)
tree5991182740cf428db790509265ade201052b1800
parentba03c7476e5e4bba1d5a06f2e7c43951ff914c32 (diff)
downloadgsoc2013-evolution-1565f9f382208eecb89e9a5e5c86f2ae4d9838d9.tar
gsoc2013-evolution-1565f9f382208eecb89e9a5e5c86f2ae4d9838d9.tar.gz
gsoc2013-evolution-1565f9f382208eecb89e9a5e5c86f2ae4d9838d9.tar.bz2
gsoc2013-evolution-1565f9f382208eecb89e9a5e5c86f2ae4d9838d9.tar.lz
gsoc2013-evolution-1565f9f382208eecb89e9a5e5c86f2ae4d9838d9.tar.xz
gsoc2013-evolution-1565f9f382208eecb89e9a5e5c86f2ae4d9838d9.tar.zst
gsoc2013-evolution-1565f9f382208eecb89e9a5e5c86f2ae4d9838d9.zip
+2005-06-16 Harish Krishnaswamy <kharish@novell.com>
* configure.in : add mono to the plugins list * data/evolution.desktop.in.in : Fix for#307176 (patch from Andre Klapper) correct the version of evolution-data-server. * plugins/mono/Makefile.am : mono-plugin.h should be included in the sources too. svn path=/trunk/; revision=29518
-rw-r--r--ChangeLog8
-rw-r--r--NEWS6
-rw-r--r--data/evolution.desktop.in.in3
-rw-r--r--plugins/mono/ChangeLog5
-rw-r--r--plugins/mono/Makefile.am2
5 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a14abfea7..64d4c0277e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-16 Harish Krishnaswamy <kharish@novell.com>
+
+ * configure.in : add mono to the plugins list
+
+ * data/evolution.desktop.in.in :
+ Fix for #307176 (patch from Andre Klapper)
+ correct the version of evolution-data-server.
+
2005-06-15 Tor Lillqvist <tml@novell.com>
* configure.in: Check for Win32. Define Automake conditional
diff --git a/NEWS b/NEWS
index 68896f2ad1..5aaf3e18a2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Evolution 2.3.3.1 2005-06-15
+-----------------------------
+
+ #307176 - Remove X-GNOME-Bugzilla-Bugzilla=Ximian (Andre Klapper)
+ Fix build issues related to the mono plugin (Harish)
+
Evolution 2.3.3, 2005-06-07
---------------------------
diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in
index ce85ca5ec1..93b1011e6e 100644
--- a/data/evolution.desktop.in.in
+++ b/data/evolution.desktop.in.in
@@ -8,7 +8,6 @@ Terminal=false
Type=Application
Categories=GNOME;Application;Office;X-Red-Hat-Base;
StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=Ximian
X-GNOME-Bugzilla-Product=Evolution
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-exchange-storage;evolution-alarm-notify;
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.4;evolution-exchange-storage;evolution-alarm-notify;
diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog
index 11f7ce36ff..2b35f93244 100644
--- a/plugins/mono/ChangeLog
+++ b/plugins/mono/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-15 Harish Krishnaswamy <kharish@novell.com>
+
+ * Makefile.am : mono-plugin.h should be included
+ in the sources too.
+
2005-05-25 Not Zed <NotZed@Ximian.com>
* mono-plugin.c: implement the mono loader as a plugin itself.
diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am
index 6cb849c126..9b0cb77a1f 100644
--- a/plugins/mono/Makefile.am
+++ b/plugins/mono/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
plugin_DATA = org-gnome-evolution-mono.eplug
plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la
-liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c
+liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h
liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version
EXTRA_DIST = org-gnome-evolution-mono.eplug.xml