[grass] 05/05: Fix desktop file with patch instead of d/rules.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch experimental
in repository grass.

commit aa6cda18873c90dccd1bd6f43e7410125496894c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 24 03:35:34 2015 +0100

    Fix desktop file with patch instead of d/rules.
---
 debian/changelog             |  1 +
 debian/patches/desktop.patch | 15 +++++++++++++++
 debian/patches/series        |  1 +
 debian/rules                 |  5 -----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de84905..6f5f040 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ grass (7.0.0~rc1-1) UNRELEASED; urgency=medium
     - Group files by license
     - Remove unused license sections
   * Add patches for various typos.
+  * Fix desktop file with patch instead of d/rules.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 15 Jan 2015 01:15:41 +0100
 
diff --git a/debian/patches/desktop.patch b/debian/patches/desktop.patch
new file mode 100644
index 0000000..f49d952
--- /dev/null
+++ b/debian/patches/desktop.patch
@@ -0,0 +1,15 @@
+Description: Add Keywords, and fix Exec & Icon in desktop file.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+
+--- a/gui/icons/grass.desktop
++++ b/gui/icons/grass.desktop
+@@ -47,6 +47,7 @@ Comment[tr]=Coğrafi bilgi sistemi
+ Comment[uk]=Геоінформаційна система
+ Comment[uz]=Geografik axborot tizimi
+ Categories=Education;Science;Geoscience;Geography;
+-Exec=grass7
+-Icon=grass
++Exec=grass70
++Icon=grass70
+ Terminal=true
++Keywords=wms;wfs;ogc;osgeo
diff --git a/debian/patches/series b/debian/patches/series
index 18b2e49..1b2b725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ default-typo.patch
 extension-typo.patch
 preferred-typo.patch
 transferred-typo.patch
+desktop.patch
diff --git a/debian/rules b/debian/rules
index a597f2a..c7dabb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -212,11 +212,6 @@ install-arch: build-arch
 		debian/tmp/usr/share/icons/hicolor/64x64/apps/$(BASE_NAME).png
 	install -m 644 gui/icons/grass.desktop \
 		debian/tmp/usr/share/applications/$(BASE_NAME).desktop
-	# n.b. 6.4.1 shipped with "grass65" as the Exec target
-	sed -i -e 's+Exec=grass7+Exec=$(BASE_NAME)+' \
-		debian/tmp/usr/share/applications/$(BASE_NAME).desktop
-	sed -i -e 's+Icon=grass+Icon=$(BASE_NAME)+' \
-		debian/tmp/usr/share/applications/$(BASE_NAME).desktop
 
 	# install AppStream metadata
 	mkdir -p debian/tmp/usr/share/appdata/

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