# HG changeset patch # User Mike Miller # Date 1424554621 18000 # Node ID 7dbb8aa43d56e626b0ff1daf22fc585dbcfca9b3 # Parent 71770cf07c30fd3817e3e8980364d9e207cb33a8 Install correct freedesktop AppData file contents (bug #43279) * etc/icons/octave.appdata.xml.in: Move here from etc and add %OCTAVE_DESKTOP_FILE% substitution pattern. * etc/icons/Makefile.am (DESKTOP_FILE, VENDOR): New variables. (octave.appdata.xml): New rule. (install-data-local, uninstall-local): Install and uninstall octave.appdata.xml. (EXTRA_DIST): Include octave.appdata.xml.in in the list. (CLEANFILES): Include octave.appdata.xml in the list. * Makefile.am (EXTRA_DIST): Remove etc/octave.appdata.xml from the list. diff -r 71770cf07c30 -r 7dbb8aa43d56 Makefile.am --- a/Makefile.am Sat Feb 21 11:58:20 2015 -0500 +++ b/Makefile.am Sat Feb 21 16:37:01 2015 -0500 @@ -63,7 +63,6 @@ etc/README.gnuplot \ etc/README.kpathsea \ etc/gdbinit \ - etc/octave.appdata.xml \ run-octave.in include m4/module.mk diff -r 71770cf07c30 -r 7dbb8aa43d56 etc/icons/Makefile.am --- a/etc/icons/Makefile.am Sat Feb 21 11:58:20 2015 -0500 +++ b/etc/icons/Makefile.am Sat Feb 21 16:37:01 2015 -0500 @@ -47,7 +47,17 @@ $(IMAGE_FILES) \ octave-logo.ico -all-local: octave.desktop $(BUILT_ICONS) +VENDOR = www.octave.org + +DESKTOP_FILE = $(VENDOR)-octave.desktop + +all-local: octave.appdata.xml octave.desktop $(BUILT_ICONS) + +octave.appdata.xml: octave.appdata.xml.in Makefile + $(AM_V_GEN)rm -f $@-t $@ && \ + $(SED) < $< > $@-t \ + -e "s|%OCTAVE_DESKTOP_FILE%|${DESKTOP_FILE}|" && \ + mv $@-t $@ octave.desktop: octave.desktop.in Makefile $(AM_V_GEN)rm -f $@-t $@ && \ @@ -69,7 +79,7 @@ install-data-local: -if test -n "$(DESKTOP_FILE_INSTALL)"; then \ $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \ - --vendor www.octave.org octave.desktop; \ + --vendor $(VENDOR) octave.desktop; \ fi for f in $(BUILT_PNG_ICONS); do \ size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \ @@ -79,16 +89,19 @@ done $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps $(INSTALL_DATA) $(srcdir)/octave-logo.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg + $(MKDIR_P) $(DESTDIR)$(datadir)/appdata + $(INSTALL_DATA) octave.appdata.xml $(DESTDIR)$(datadir)/appdata/$(VENDOR)-octave.appdata.xml uninstall-local: if test -n "$(DESKTOP_FILE_INSTALL)"; then \ - rm -f $(DESTDIR)$(datadir)/applications/www.octave.org-octave.desktop; \ + rm -f $(DESTDIR)$(datadir)/applications/$(DESKTOP_FILE); \ fi for f in $(BUILT_PNG_ICONS); do \ size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \ 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 if AMCOND_HAVE_ICON_TOOLS else @@ -99,9 +112,10 @@ EXTRA_DIST = \ $(BUILT_ICONS) \ $(IMAGE_FILES) \ + octave.appdata.xml.in \ octave.desktop.in -CLEANFILES = octave.desktop +CLEANFILES = octave.appdata.xml octave.desktop MAINTAINERCLEANFILES = $(BUILT_ICONS) diff -r 71770cf07c30 -r 7dbb8aa43d56 etc/icons/octave.appdata.xml.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/icons/octave.appdata.xml.in Sat Feb 21 16:37:01 2015 -0500 @@ -0,0 +1,56 @@ + + + + %OCTAVE_DESKTOP_FILE% + GPLv3+ + GNU Octave + Interactive programming environment for numerical computations + +

+ GNU Octave is a high-level interpreted language, primarily intended for + numerical computations. It provides capabilities for the numerical + solution of linear and nonlinear problems, and for performing other + numerical experiments. It also provides extensive graphics capabilities + for data visualization and manipulation. Octave is normally used through + its interactive command line interface, but it can also be used to write + non-interactive programs. The Octave language is quite similar to + Matlab so that most programs are easily portable. +

+

+ Octave has extensive tools for solving common numerical linear algebra + problems, finding the roots of nonlinear equations, integrating ordinary + functions, manipulating polynomials, and integrating ordinary + differential and differential-algebraic equations. It is easily + extensible and customizable via user-defined functions written in + Octave's own language, or using dynamically loaded modules written in + C++, C, Fortran, or other languages. +

+ + + + http://www.gnu.org/software/octave/images/screenshot.png + + http://www.octave.org + maintainers@octave.org + GNU + diff -r 71770cf07c30 -r 7dbb8aa43d56 etc/octave.appdata.xml --- a/etc/octave.appdata.xml Sat Feb 21 11:58:20 2015 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ - - - - octave.desktop - GPLv3+ - GNU Octave - Interactive programming environment for numerical computations - -

- GNU Octave is a high-level interpreted language, primarily intended for - numerical computations. It provides capabilities for the numerical - solution of linear and nonlinear problems, and for performing other - numerical experiments. It also provides extensive graphics capabilities - for data visualization and manipulation. Octave is normally used through - its interactive command line interface, but it can also be used to write - non-interactive programs. The Octave language is quite similar to - Matlab so that most programs are easily portable. -

-

- Octave has extensive tools for solving common numerical linear algebra - problems, finding the roots of nonlinear equations, integrating ordinary - functions, manipulating polynomials, and integrating ordinary - differential and differential-algebraic equations. It is easily - extensible and customizable via user-defined functions written in - Octave's own language, or using dynamically loaded modules written in - C++, C, Fortran, or other languages. -

- - - - http://www.gnu.org/software/octave/images/screenshot.png - - http://www.octave.org - maintainers@octave.org - GNU -