[grass] 01/02: Don't install AppStream metadata in legacy location.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository grass.

commit 6ed9f0bb1048d4d322964383c472b1f23dacf1d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jan 9 22:01:47 2018 +0100

    Don't install AppStream metadata in legacy location.
---
 debian/changelog | 6 ++++++
 debian/rules     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 386b65b..017977a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.4.0~rc2-1~exp2) UNRELEASED; urgency=medium
+
+  * Don't install AppStream metadata in legacy location.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 09 Jan 2018 22:01:34 +0100
+
 grass (7.4.0~rc2-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/rules b/debian/rules
index e407ae0..0b26378 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,8 +175,8 @@ install-arch-stamp:
 	mv debian/tmp/usr/lib/$(BASE_NAME)/share/applications/grass.desktop debian/tmp/usr/share/applications/$(BASE_NAME).desktop
 
 	# install AppStream metadata
-	mkdir -p debian/tmp/usr/share/appdata
-	mv debian/tmp/usr/lib/$(BASE_NAME)/share/appdata/grass.appdata.xml debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
+	mkdir -p debian/tmp/usr/share/metainfo
+	mv debian/tmp/usr/lib/$(BASE_NAME)/share/appdata/grass.appdata.xml debian/tmp/usr/share/metainfo/org.osgeo.grass.appdata.xml
 
 	# install grass wrapper scripts
 	install -m 755 debian/x-grass7 debian/tmp/usr/bin/x-$(BASE_NAME)

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