[spatialite-gui] 02/06: Use desktop file in favor of menu file per CTTE #741573.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository spatialite-gui.

commit 43d382c016c42d86b2b711bff4fae835d2a2c2b0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 12 03:17:23 2016 +0100

    Use desktop file in favor of menu file per CTTE #741573.
    
    Install application icon in hicolor theme.
---
 debian/changelog                  |  2 ++
 debian/install                    |  3 ++-
 debian/menu                       |  5 -----
 debian/patches/desktop-file.patch | 18 ++++++++++++++++++
 debian/patches/series             |  1 +
 debian/spatialite-gui.desktop     |  7 -------
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a7f17d..e47ba14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 spatialite-gui (2.0.0~devel2-3) UNRELEASED; urgency=medium
 
   * Update Vcs-Git URL to use HTTPS.
+  * Use desktop file in favor of menu file per CTTE #741573.
+  * Install application icon in hicolor theme.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 12 Mar 2016 03:17:08 +0100
 
diff --git a/debian/install b/debian/install
index efcc349..a973fe0 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,4 @@
-debian/spatialite-gui.desktop	usr/share/applications/
+gnome_resource/spatialite-gui.desktop	usr/share/applications/
+gnome_resource/spatialite-gui.png	usr/share/icons/hicolor/48x48/apps/
 
 usr/bin/
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 550be4e..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(spatialite-gui): \
-  needs="X11" \
-  section="Applications/Data Management" \
-  title="Spatialite GUI" \
-  command="/usr/bin/spatialite-gui"
diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
new file mode 100644
index 0000000..53c839f
--- /dev/null
+++ b/debian/patches/desktop-file.patch
@@ -0,0 +1,18 @@
+Description: Add Exec variable & Keywords to desktop file. Drop shebang.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/gnome_resource/spatialite-gui.desktop
++++ b/gnome_resource/spatialite-gui.desktop
+@@ -1,10 +1,10 @@
+-#!/usr/bin/env xdg-open
+ [Desktop Entry]
+ Name=Spatialite GUI
+ GenericName=GUI for Spatialite databases
+ Comment=Manage Spatialite databases
+-Exec=spatialite_gui
++Exec=spatialite-gui %f
+ Icon=spatialite-gui
+ Terminal=false
+ Type=Application
+ Categories=Education;Geography;Science;
++Keywords=spatial;sqlite;gis;
diff --git a/debian/patches/series b/debian/patches/series
index 1e9839c..fe9ad5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-fix_binary_name.patch
+desktop-file.patch
diff --git a/debian/spatialite-gui.desktop b/debian/spatialite-gui.desktop
deleted file mode 100644
index 718a448..0000000
--- a/debian/spatialite-gui.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Spatialite GUI
-Exec=spatialite-gui %f
-Terminal=false
-Type=Application
-Categories=Development;Database;
-Keywords=spatial;sqlite;gis

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-gui.git