From 34ff1d48c04bd106e28477124769ca37727fe194 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 1 Dec 2003 22:37:49 +0000 Subject: Install evolution.desktop as evolution-$(BASE_VERSION).desktop Remove 2003-12-01 Rodney Dawes * 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 svn path=/trunk/; revision=23546 --- data/Makefile.am | 2 +- data/evolution.desktop.in | 12 ------------ data/evolution.desktop.in.in | 6 +++--- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 data/evolution.desktop.in (limited to 'data') 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; -- cgit v1.2.3