From daa303eedb6e900836a721673dcd2af444748c87 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 29 Nov 2005 12:53:29 +0000 Subject: R data/bme.desktop.in: A data/bme.desktop.in.in: R 2005-11-29 Christian Persch * configure.ac: * data/Makefile.am: R data/bme.desktop.in: A data/bme.desktop.in.in: R data/epiphany.desktop.in: A data/epiphany.desktop.in.in: Remove empty DocPath from desktop files, and add bugzilla version. Generate the .in files from configure. --- ChangeLog | 12 ++++++++++++ configure.ac | 2 ++ data/Makefile.am | 8 +++----- data/bme.desktop.in | 15 --------------- data/bme.desktop.in.in | 15 +++++++++++++++ data/epiphany.desktop.in | 16 ---------------- data/epiphany.desktop.in.in | 16 ++++++++++++++++ 7 files changed, 48 insertions(+), 36 deletions(-) delete mode 100644 data/bme.desktop.in create mode 100644 data/bme.desktop.in.in delete mode 100644 data/epiphany.desktop.in create mode 100644 data/epiphany.desktop.in.in diff --git a/ChangeLog b/ChangeLog index dc4e1cb9b..d46343288 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-11-29 Christian Persch + + * configure.ac: + * data/Makefile.am: + R data/bme.desktop.in: + A data/bme.desktop.in.in: + R data/epiphany.desktop.in: + A data/epiphany.desktop.in.in: + + Remove empty DocPath from desktop files, and add bugzilla version. + Generate the .in files from configure. + 2005-11-28 Christian Persch * configure.ac: diff --git a/configure.ac b/configure.ac index f12b487a9..0f5a708c8 100644 --- a/configure.ac +++ b/configure.ac @@ -614,6 +614,8 @@ AC_CONFIG_FILES([ Makefile data/Makefile data/epiphany-1.10.pc +data/epiphany.desktop.in +data/bme.desktop.in data/glade/Makefile data/art/Makefile data/ui/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 79703f376..ecca2c602 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -29,11 +29,9 @@ server_in_files = GNOME_Epiphany_Automation.server.in server_DATA = GNOME_Epiphany_Automation.server serverdir = $(libdir)/bonobo/servers -DESKTOP_IN_FILES= epiphany.desktop.in bme.desktop.in -DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop) - +desktop_in_file= epiphany.desktop.in.in bme.desktop.in.in desktopdir = $(datadir)/applications -desktop_DATA = $(DESKTOP_FILES) +desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) applicationsdir = $(datadir)/application-registry applications_DATA = epiphany.applications @@ -73,7 +71,7 @@ EXTRA_DIST = \ $(server_in_files) \ $(schema_in_files) \ $(font_schema_files) \ - $(DESKTOP_IN_FILES) \ + $(desktop_in_files) \ $(about_DATA) \ $(applications_DATA) \ $(mimepermission_DATA) \ diff --git a/data/bme.desktop.in b/data/bme.desktop.in deleted file mode 100644 index f2e1da1a4..000000000 --- a/data/bme.desktop.in +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=Epiphany Web Bookmarks -_GenericName=Web Bookmarks -_Comment=Browse and organize your bookmarks -Exec=epiphany --bookmarks-editor -StartupNotify=true -Terminal=false -Type=Application -Icon=epiphany-bookmarks.png -X-GNOME-DocPath= -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=epiphany -X-GNOME-Bugzilla-Component=General -Categories=Application;Network;GNOME;GTK; diff --git a/data/bme.desktop.in.in b/data/bme.desktop.in.in new file mode 100644 index 000000000..acefabe19 --- /dev/null +++ b/data/bme.desktop.in.in @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Epiphany Web Bookmarks +_GenericName=Web Bookmarks +_Comment=Browse and organize your bookmarks +Exec=epiphany --bookmarks-editor +StartupNotify=true +Terminal=false +Type=Application +Icon=epiphany-bookmarks.png +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=epiphany +X-GNOME-Bugzilla-Component=General +X-GNOME-Bugzilla-Version=@VERSION@ +Categories=Application;Network;GNOME;GTK; diff --git a/data/epiphany.desktop.in b/data/epiphany.desktop.in deleted file mode 100644 index 3edcb81de..000000000 --- a/data/epiphany.desktop.in +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=Epiphany Web Browser -_GenericName=Web Browser -_Comment=Browse the web -Exec=epiphany %U -StartupNotify=true -Terminal=false -Type=Application -Icon=web-browser.png -X-GNOME-DocPath= -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=epiphany -X-GNOME-Bugzilla-Component=General -Categories=Application;Network;GNOME;GTK;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in new file mode 100644 index 000000000..9f57afd5f --- /dev/null +++ b/data/epiphany.desktop.in.in @@ -0,0 +1,16 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Epiphany Web Browser +_GenericName=Web Browser +_Comment=Browse the web +Exec=epiphany %U +StartupNotify=true +Terminal=false +Type=Application +Icon=web-browser.png +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=epiphany +X-GNOME-Bugzilla-Component=General +X-GNOME-Bugzilla-Version=@VERSION@ +Categories=Application;Network;GNOME;GTK;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml; -- cgit v1.2.3