summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-29 12:43:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-29 12:43:58 +0200
commit94b3317504dade2520f47e813c780f7e54a3ac2f (patch)
tree2cf1f08c9a89a8e490efa7a4071b9b44de83bbdf /data
parent2fb926c2bb3fd45a2d1428db6a44ce9da8b9a85d (diff)
Imported Upstream version 3.17.1upstream/3.17.1
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am6
-rw-r--r--data/Makefile.in79
-rw-r--r--data/simple-scan.appdata.xml.in (renamed from data/simple-scan.appdata.xml)15
3 files changed, 54 insertions, 46 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/Makefile.in b/data/Makefile.in
index 8ec41db..6031c4e 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_man1_MANS) $(dist_appdata_DATA)
+ $(dist_man1_MANS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -141,11 +141,11 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \
- "$(DESTDIR)$(appdatadir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" \
+ "$(DESTDIR)$(desktopdir)"
NROFF = nroff
MANS = $(dist_man1_MANS)
-DATA = $(desktop_DATA) $(dist_appdata_DATA)
+DATA = $(appdata_DATA) $(desktop_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -328,10 +328,11 @@ SUBDIRS = icons
desktopdir = $(datadir)/applications
desktop_DATA = simple-scan.desktop
appdatadir = $(datadir)/appdata
-dist_appdata_DATA = simple-scan.appdata.xml
+appdata_DATA = simple-scan.appdata.xml
gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
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
@@ -340,6 +341,7 @@ DISTCLEANFILES = \
Makefile.in \
$(schema_DATA) \
$(desktop_DATA) \
+ $(appdata_DATA) \
$(gsettings_SCHEMAS)
all: all-recursive
@@ -416,48 +418,48 @@ uninstall-man1:
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-desktopDATA: $(desktop_DATA)
+install-appdataDATA: $(appdata_DATA)
@$(NORMAL_INSTALL)
- @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
done
-uninstall-desktopDATA:
+uninstall-appdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-install-dist_appdataDATA: $(dist_appdata_DATA)
+ dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
+install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
done
-uninstall-dist_appdataDATA:
+uninstall-desktopDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
+ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@@ -618,7 +620,7 @@ check: check-recursive
all-am: Makefile $(MANS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(appdatadir)"; do \
+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -672,8 +674,7 @@ info: info-recursive
info-am:
-install-data-am: install-desktopDATA install-dist_appdataDATA \
- install-man
+install-data-am: install-appdataDATA install-desktopDATA install-man
install-dvi: install-dvi-recursive
@@ -717,7 +718,7 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-desktopDATA uninstall-dist_appdataDATA \
+uninstall-am: uninstall-appdataDATA uninstall-desktopDATA \
uninstall-man
uninstall-man: uninstall-man1
@@ -727,20 +728,20 @@ uninstall-man: uninstall-man1
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
check-am clean clean-generic cscopelist-am ctags ctags-am \
distclean distclean-generic distclean-tags distdir dvi dvi-am \
- html html-am info info-am install install-am install-data \
- install-data-am install-desktopDATA install-dist_appdataDATA \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-man1 install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-desktopDATA uninstall-dist_appdataDATA uninstall-man \
- uninstall-man1
+ html html-am info info-am install install-am \
+ install-appdataDATA install-data install-data-am \
+ install-desktopDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-man1 install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-appdataDATA uninstall-desktopDATA \
+ uninstall-man uninstall-man1
@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_XML_NOMERGE_RULE@
+@INTLTOOL_XML_RULE@
@GSETTINGS_RULES@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/data/simple-scan.appdata.xml b/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>