aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--data/Makefile.am2
-rw-r--r--data/evolution.desktop.in12
-rw-r--r--data/evolution.desktop.in.in6
4 files changed, 12 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 28fe037bd9..fc2aed1d42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2003-12-01 Rodney Dawes <dobey@ximian.com>
+ * data/Makefile.am: Install evolution.desktop as
+ evolution-$(BASE_VERSION).desktop
+ * data/evolution.desktop.in: Remove generated file
+ * data/evolution.desktop.in.in: Add (Unstable) to name
+ Fix comment to be more correct and have correct capitalization
+
+2003-12-01 Rodney Dawes <dobey@ximian.com>
+
* tools/killev.c: Use BASE_VERSION for repo_ids and OAFIIDs,
Update gnome-spell repo_id to correct version,
Update gtkhtml editor OAFIID to GtkHTML 3.1
diff --git a/data/Makefile.am b/data/Makefile.am
index 3bc4b3aaae..f33f034bf0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -36,7 +36,7 @@ SUBDIRS = cde_app_root
install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
$(mkinstalldirs) $(DESTDIR)$(desktopdir); \
$(INSTALL_DATA) $(desktop_file) \
- $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop.in=-$(BASE_VERSION).desktop) ; \
+ $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; \
$(mkinstalldirs) $(DESTDIR)$(keysdir); \
$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ; \
$(mkinstalldirs) $(DESTDIR)$(mimedir); \
diff --git a/data/evolution.desktop.in b/data/evolution.desktop.in
deleted file mode 100644
index d8fada2802..0000000000
--- a/data/evolution.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-_Name=Ximian Evolution
-_Comment=The Evolution groupware suite
-Exec=evolution-1.5
-Icon=evolution-1.5.png
-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-wombat;evolution-exchange-storage;
diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in
index f29595a26c..fac97ed2f6 100644
--- a/data/evolution.desktop.in.in
+++ b/data/evolution.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
-_Name=Ximian Evolution
-_Comment=The Evolution groupware suite
+_Name=Ximian Evolution (Unstable)
+_Comment=The Ximian Evolution Groupware Suite
Exec=evolution-@BASE_VERSION@
Icon=evolution-@BASE_VERSION@.png
Terminal=false
@@ -9,4 +9,4 @@ 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-wombat;evolution-exchange-storage;
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server;evolution-exchange-storage;