[Pkg-octave-commit] [octave] 02/02: Ship AppStream metadata.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit 45b52793917c6e2e1a89c6450c27b07ad9ae90f7
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Mar 3 23:37:21 2017 +0100

    Ship AppStream metadata.
    
    In particular, introduce new patch d/p/appstream-upgrade-spec.patch to conform
    with most recent AppStream specification.
    
    Closes: 825803
    Gbp-Dch: Full
---
 debian/octave.install                       |  1 +
 debian/patches/appstream-upgrade-spec.patch | 42 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/octave.install b/debian/octave.install
index 32173e7..79db6df 100644
--- a/debian/octave.install
+++ b/debian/octave.install
@@ -2,3 +2,4 @@ usr/bin/octave
 usr/bin/octave-cli
 usr/lib/*/octave/*
 usr/share/applications
+usr/share/metainfo
diff --git a/debian/patches/appstream-upgrade-spec.patch b/debian/patches/appstream-upgrade-spec.patch
new file mode 100644
index 0000000..1860f36
--- /dev/null
+++ b/debian/patches/appstream-upgrade-spec.patch
@@ -0,0 +1,42 @@
+Description: Upgrade to more recent AppStream specification.
+ - install appdata file into $(datadir)/metainfo (instead of legacy
+   $(datadir)/appdata).
+ - use component type "desktop-application" (instead of legacy type "desktop")
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: https://savannah.gnu.org/patch/?9277
+Last-Update: 2017-03-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/module.mk
++++ b/etc/module.mk
+@@ -110,8 +110,8 @@ install-icons:
+ 	done
+ 	$(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/etc/icons/octave-logo.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg
+-	$(MKDIR_P) $(DESTDIR)$(datadir)/appdata
+-	$(INSTALL_DATA) etc/icons/octave.appdata.xml $(DESTDIR)$(datadir)/appdata/$(VENDOR)-octave.appdata.xml
++	$(MKDIR_P) $(DESTDIR)$(datadir)/metainfo
++	$(INSTALL_DATA) etc/icons/octave.appdata.xml $(DESTDIR)$(datadir)/metainfo/$(VENDOR)-octave.appdata.xml
+ 
+ uninstall-icons:
+ 	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
+@@ -122,7 +122,7 @@ uninstall-icons:
+ 	  rm -f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \
+ 	done
+ 	rm -f $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg
+-	rm -f $(DESTDIR)$(datadir)/appdata/$(VENDOR)-octave.appdata.xml
++	rm -f $(DESTDIR)$(datadir)/metainfo/$(VENDOR)-octave.appdata.xml
+ 
+ EXTRA_DIST += $(etc_EXTRA_DIST)
+ 
+--- a/etc/icons/octave.appdata.xml.in
++++ b/etc/icons/octave.appdata.xml.in
+@@ -15,7 +15,7 @@
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+-<component type="desktop">
++<component type="desktop-application">
+   <id>%OCTAVE_DESKTOP_FILE%</id>
+   <metadata_license>FSFAP</metadata_license>
+   <project_license>GPL-3.0+</project_license>
diff --git a/debian/patches/series b/debian/patches/series
index 143139d..563509a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ mkoctfile-mpi.diff
 always-build-octave-jar.patch
 hdf5-flags.patch
 hdf5-mkoctfile.patch
+appstream-upgrade-spec.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git