[grass] 02/07: Move appstream metadata fix from rules file to patch.

[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 8e4b9779fc3a4a94e1f929c4d1c3ca7cdfdd052d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 25 15:35:12 2015 +0100

    Move appstream metadata fix from rules file to patch.
---
 debian/patches/appstream.patch | 14 ++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  2 --
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/appstream.patch b/debian/patches/appstream.patch
new file mode 100644
index 0000000..e77cbd5
--- /dev/null
+++ b/debian/patches/appstream.patch
@@ -0,0 +1,14 @@
+Description: Fix desktop filename.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+
+--- a/gui/icons/grass.appdata.xml
++++ b/gui/icons/grass.appdata.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Richard Hughes <richard at hughsie.com> -->
+ <application>
+-  <id type="desktop">grass.desktop</id>
++  <id type="desktop">grass70.desktop</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <project_license>GPL-2.0+</project_license>
+   <summary>GRASS GIS, the Open Source Geographic Information System</summary>
diff --git a/debian/patches/series b/debian/patches/series
index 50626ef..95f1509 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ preferred-typo.patch
 transferred-typo.patch
 allows-to-typo.patch
 desktop.patch
+appstream.patch
diff --git a/debian/rules b/debian/rules
index 9198239..eeee760 100755
--- a/debian/rules
+++ b/debian/rules
@@ -169,8 +169,6 @@ override_dh_auto_install-arch:
 	mkdir -p debian/tmp/usr/share/appdata/
 	install -m 644 gui/icons/grass.appdata.xml \
 		debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
-	sed -i -e 's+<id type="desktop">grass.desktop</id>+<id type="desktop">$(BASE_NAME).desktop</id>+' \
-		debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
 
 	# install grass wrapper scripts
 	install -m 755 debian/grass7 debian/tmp/usr/bin/$(BASE_NAME)

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