Set it up so desktop file gets installed

git-svn-id: svn+ssh://svn.gnome.org/svn/pitivi/trunk@682 d3729300-e425-0410-8a4c-d956edccc248
nekohayo · Jan 25, 2006 · 259568f · 259568f
1 parent 8806b45
commit 259568f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/.cvsignore b/.cvsignore
@@ -16,4 +16,4 @@ mkinstalldirs
 pitivi.spec
 py-compile
 stamp-h.in
-
+pitivi.desktop
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Add .cvsignore files
 	* Add COPYING file with the LGPL
+	* Configure .desktop file to get installed
 
 2006-01-24  Edward Hervey  <edward@fluendo.com>
 

diff --git a/Makefile.am b/Makefile.am
@@ -2,10 +2,13 @@ AUTOMAKE_OPTIONS = dist-bzip2
 
 SUBDIRS	= bin pitivi common
 
+desktopdir = $(datadir)/applications
+desktop_DATA = pitivi.desktop
+
+
 EXTRA_DIST = \
 	pitivi.spec \
 	pitivi.spec.in \
-	pitivi.desktop \
 	ChangeLog \
 	autogen.sh \
 	NEWS \

diff --git a/configure.ac b/configure.ac
@@ -116,4 +116,5 @@ pitivi/configure.py
 pitivi/ui/Makefile
 pitivi/pixmaps/Makefile
 pitivi.spec
+pitivi.desktop
 )
diff --git a/pitivi.desktop → pitivi.desktop.in b/pitivi.desktop → pitivi.desktop.in
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=pitivi
+Name=Pitivi
 Comment=Non-linear video editor
 Comment[fr]=Editeur Vidéo Non-Linéaire
 Exec=pitivi
 Terminal=false
 Type=Application
 Icon=pitivi/pitivi-48.png
-Categories=GNOME;Application;AudioVideo;
-StartupNotify=false
+Categories=GNOME;GTK;Application;AudioVideo;X-Ximian-Main;X-Red-Hat-Base;
+StartupNotify=true
diff --git a/pitivi.spec.in b/pitivi.spec.in
@@ -42,6 +42,7 @@ PiTiVi non-linear video editor
 %{_bindir}/pitivi
 %{_libdir}/pitivi
 %{_datadir}/pitivi/pixmaps/*
+%{_datadir}/applications/pitivi.desktop
 
 %changelog
 * Thu Jun 23 2005 Christian Schaller <christian at fluendo dot com>