[simple-scan/gnome-3-16: 7/12] Make appdata translatable and add screenshot

[Robert Ancell <rancell src gnome org>]

commit cc25c887c581243a96e0de4fc4b6fbc01d80b6db
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Apr 15 12:19:43 2015 +1200

    Make appdata translatable and add screenshot

 data/Makefile.am                                   |    6 ++++--
 ...scan.appdata.xml => simple-scan.appdata.xml.in} |   15 ++++++++++-----
 po/POTFILES.in                                     |    1 +
 3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index b436f12..6d68e8e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,15 +5,16 @@ desktop_DATA = simple-scan.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 appdatadir = $(datadir)/appdata
-dist_appdata_DATA = simple-scan.appdata.xml
+appdata_DATA = simple-scan.appdata.xml
+@INTLTOOL_XML_RULE@
 
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 dist_man1_MANS = simple-scan.1
 
 EXTRA_DIST = simple-scan.desktop.in \
+             simple-scan.appdata.xml.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
              simple-scan.gresource.xml
@@ -22,4 +23,5 @@ DISTCLEANFILES = \
        Makefile.in \
        $(schema_DATA) \
        $(desktop_DATA) \
+       $(appdata_DATA) \
        $(gsettings_SCHEMAS)
diff --git a/data/simple-scan.appdata.xml b/data/simple-scan.appdata.xml.in
similarity index 63%
rename from data/simple-scan.appdata.xml
rename to data/simple-scan.appdata.xml.in
index dd57ff6..3a3d0ef 100644
--- a/data/simple-scan.appdata.xml
+++ b/data/simple-scan.appdata.xml.in
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
   <id type="desktop">simple-scan.desktop</id>
-  <licence>CC0</licence>
+  <metadata_licence>CC0-1.0</metadata_licence>
+  <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license>
+  <_name>Simple Scan</_name>
   <description>
-    <p>
+    <_p>
       A really easy way to scan both documents and photos.
       You can crop out the bad parts of a photo and rotate it if it is the wrong way round.
       You can print your scans, export them to pdf, or save them in a range of image formats.
-    </p>
-    <p>
+    </_p>
+    <_p>
       Simple Scan uses the SANE framework to support most existing scanners.
-    </p>
+    </_p>
   </description>
+  <screenshots>
+    <screenshot type="default">https://launchpadlibrarian.net/203209644/simple-scan.png</screenshot>
+  </screenshots>
   <url type="homepage">https://launchpad.net/simple-scan</url>
 </application>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 93a99e0..4dd5502 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
 [encoding: UTF-8]
 [type: gettext/glade]data/simple-scan.ui
 data/simple-scan.desktop.in
+data/simple-scan.appdata.xml.in
 data/org.gnome.SimpleScan.gschema.xml.in
 src/book.vala
 src/book-view.vala