Tell Git to ignore .desktop files globally

These files are all generated by the build, with the exception of the
template.desktop file, so:

* Have Git ignore all *.desktop files.
* Rename template.desktop to template.desktop.in to
  avoid a clash with this new ignore rule.
* Remove the checked-in image-crop.desktop file, which is built
  anyway.

diff --git a/.gitignore b/.gitignore
index af6579c..fdcda09 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@ Makefile.in
 *.rej
 *.orig
 
+# GNOME .desktop files
+*.desktop
+
 # /
 /aclocal.m4
 /autom4te.cache
@@ -32,23 +35,10 @@ Makefile.in
 /depcomp
 /auxdir
 /stamp-h1
-/geeqie.desktop
 /intltool-extract.in
 /intltool-update.in
 /intltool-merge.in
 
-# /plugins/import/
-/plugins/import/*.desktop
-
-# /plugins/rotate/
-/plugins/rotate/*.desktop
-
-# /plugins/symlink/
-/plugins/symlink/*.desktop
-
-# /plugins/ufraw/
-/plugins/ufraw/*.desktop
-
 # /po/
 /po/Makefile.in.in
 /po/POTFILES

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b0b5d65..7f86e7d 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,6 @@
 
 SUBDIRS = rotate symlink ufraw import geocode-parameters export-jpeg tethered-photography camera-import image-crop
 qq_desktoptemplatedir = $(appdir)
-qq_desktoptemplate_DATA = template.desktop
+qq_desktoptemplate_DATA = template.desktop.in
 
 EXTRA_DIST = $(qq_desktoptemplate_DATA)

diff --git a/plugins/image-crop/image-crop.desktop b/plugins/image-crop/image-crop.desktop
deleted file mode 100644 (file)
index 7501e92..0000000
--- a/plugins/image-crop/image-crop.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Image crop
-
-# Requires ImageMagick and exiftools
-
-Exec=geeqie-image-crop %f
-
-# Desktop files that are usable only in Geeqie should be marked like this:
-Categories=X-Geeqie;
-OnlyShowIn=X-Geeqie;
-
-# It can be made verbose
-#X-Geeqie-Verbose=true
-
-Icon=geeqie

diff --git a/plugins/template.desktop b/plugins/template.desktop.in
similarity index 100%
rename from plugins/template.desktop
rename to plugins/template.desktop.in

diff --git a/src/main.h b/src/main.h
index 1048fd2..979bb79 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -123,7 +123,7 @@
 #include "debug.h"
 #include "options.h"
 
-#define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop"
+#define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop.in"
 
 #define TIMEZONE_DATABASE "timezone21.bin"