diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-04-30 19:25:09 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-04-30 19:25:09 +0200 |
commit | 1d2f47520c4aa0f47459246d660485ef6b80cc48 (patch) | |
tree | 41549a3ebec3c60afde4554daa61c3c19e266b16 /data | |
parent | d427874ae9bf8393c9ee6b020bf8b62f531dd4dd (diff) | |
parent | 6434f7a5b8bdb0c4cf71879d0c904938cf44dcc5 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'data')
-rw-r--r-- | data/meson.build | 2 | ||||
-rw-r--r-- | data/simple-scan.appdata.xml.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/meson.build b/data/meson.build index cf7401b..9bba15f 100644 --- a/data/meson.build +++ b/data/meson.build @@ -23,7 +23,7 @@ i18n.merge_file ('appdata-file', input: 'simple-scan.appdata.xml.in', output: 'simple-scan.appdata.xml', install: true, - install_dir: join_paths (datadir, 'appdata'), + install_dir: join_paths (datadir, 'metainfo'), po_dir: '../po') install_man ('simple-scan.1') diff --git a/data/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in index 0d306cd..898045a 100644 --- a/data/simple-scan.appdata.xml.in +++ b/data/simple-scan.appdata.xml.in @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id type="desktop">simple-scan.desktop</id> - <metadata_licence>CC0-1.0</metadata_licence> + <id>simple-scan.desktop</id> + <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license> <name>Simple Scan</name> <summary>Scan Documents</summary> |