diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 25 | ||||
| -rw-r--r-- | data/Makefile.in | 70 | ||||
| -rw-r--r-- | data/appdata/Makefile.am | 8 | ||||
| -rw-r--r-- | data/appdata/Makefile.in | 498 | ||||
| -rw-r--r-- | data/icons/Makefile.in | 46 | ||||
| -rw-r--r-- | data/org.gnome.SimpleScan.gschema.xml | 70 | ||||
| -rw-r--r-- | data/org.gnome.SimpleScan.gschema.xml.in | 70 | ||||
| -rw-r--r-- | data/simple-scan.appdata.xml.in (renamed from data/appdata/simple-scan.appdata.xml.in) | 17 | ||||
| -rw-r--r-- | data/simple-scan.desktop.in | 9 | 
9 files changed, 181 insertions, 632 deletions
| diff --git a/data/Makefile.am b/data/Makefile.am index e367c9e..5f421a0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,21 +1,30 @@ -SUBDIRS = icons appdata +SUBDIRS = icons  desktopdir = $(datadir)/applications -desktop_DATA = simple-scan.desktop -@INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_XML_NOMERGE_RULE@ +desktop_in_files = simple-scan.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + +$(desktop_DATA): $(desktop_in_files) +	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@  gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml  @GSETTINGS_RULES@ +appstream_in_files = simple-scan.appdata.xml.in +appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml) +@APPSTREAM_XML_RULES@ + +$(appstream_XML): $(appstream_in_files) +	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ +  dist_man1_MANS = simple-scan.1 -EXTRA_DIST = simple-scan.desktop.in \ -             org.gnome.SimpleScan.gschema.xml.in \ +EXTRA_DIST = $(desktop_in_files)  \ +             $(appstream_in_files) \ +             $(gsettings_SCHEMAS) \               simple-scan.ui \               simple-scan.gresource.xml  DISTCLEANFILES = \ -	$(schema_DATA) \  	$(desktop_DATA) \ -	$(gsettings_SCHEMAS) +	$(appstream_XML) diff --git a/data/Makefile.in b/data/Makefile.in index 5d380ac..d9bc6f4 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -86,11 +86,17 @@ POST_INSTALL = :  NORMAL_UNINSTALL = :  PRE_UNINSTALL = :  POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@  subdir = data  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ -	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ -	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ +	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \ +	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ +	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ +	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \  	$(top_srcdir)/configure.ac  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \  	$(ACLOCAL_M4) @@ -213,9 +219,9 @@ am__relativize = \    done; \    reldir="$$dir2"  ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@  AMTAR = @AMTAR@  AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@  AUTOCONF = @AUTOCONF@  AUTOHEADER = @AUTOHEADER@  AUTOMAKE = @AUTOMAKE@ @@ -235,10 +241,12 @@ ECHO_N = @ECHO_N@  ECHO_T = @ECHO_T@  EGREP = @EGREP@  EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@  GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@  GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@  GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@  GREP = @GREP@  GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@  HELP_DIR = @HELP_DIR@ @@ -247,24 +255,23 @@ INSTALL_DATA = @INSTALL_DATA@  INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_SCRIPT = @INSTALL_SCRIPT@  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@  ITSTOOL = @ITSTOOL@  LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@  LIBOBJS = @LIBOBJS@  LIBS = @LIBS@  LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@  LTLIBOBJS = @LTLIBOBJS@  MAINT = @MAINT@  MAKEINFO = @MAKEINFO@  MKDIR_P = @MKDIR_P@  MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@  MSGMERGE = @MSGMERGE@  OBJEXT = @OBJEXT@  PACKAGE = @PACKAGE@ @@ -280,6 +287,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@  PKG_CONFIG = @PKG_CONFIG@  PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@  PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POSUB = @POSUB@ +SED = @SED@  SET_MAKE = @SET_MAKE@  SHELL = @SHELL@  SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@ @@ -289,6 +298,8 @@ USE_NLS = @USE_NLS@  VALAC = @VALAC@  VERSION = @VERSION@  XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  XMLLINT = @XMLLINT@  YELP_LC_DIST = @YELP_LC_DIST@  YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ @@ -302,8 +313,13 @@ am__leading_dot = @am__leading_dot@  am__quote = @am__quote@  am__tar = @am__tar@  am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@  bindir = @bindir@ +build = @build@  build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@  builddir = @builddir@  datadir = @datadir@  datarootdir = @datarootdir@ @@ -311,13 +327,15 @@ docdir = @docdir@  dvidir = @dvidir@  exec_prefix = @exec_prefix@  gsettingsschemadir = @gsettingsschemadir@ +host = @host@  host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@  htmldir = @htmldir@  includedir = @includedir@  infodir = @infodir@  install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@  libdir = @libdir@  libexecdir = @libexecdir@  localedir = @localedir@ @@ -338,20 +356,23 @@ target_alias = @target_alias@  top_build_prefix = @top_build_prefix@  top_builddir = @top_builddir@  top_srcdir = @top_srcdir@ -SUBDIRS = icons appdata +SUBDIRS = icons  desktopdir = $(datadir)/applications -desktop_DATA = simple-scan.desktop +desktop_in_files = simple-scan.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)  gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml +appstream_in_files = simple-scan.appdata.xml.in +appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)  dist_man1_MANS = simple-scan.1 -EXTRA_DIST = simple-scan.desktop.in \ -             org.gnome.SimpleScan.gschema.xml.in \ +EXTRA_DIST = $(desktop_in_files)  \ +             $(appstream_in_files) \ +             $(gsettings_SCHEMAS) \               simple-scan.ui \               simple-scan.gresource.xml  DISTCLEANFILES = \ -	$(schema_DATA) \  	$(desktop_DATA) \ -	$(gsettings_SCHEMAS) +	$(appstream_XML)  all: all-recursive @@ -727,9 +748,14 @@ uninstall-man: uninstall-man1  .PRECIOUS: Makefile -@INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_XML_NOMERGE_RULE@ + +$(desktop_DATA): $(desktop_in_files) +	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@  @GSETTINGS_RULES@ +@APPSTREAM_XML_RULES@ + +$(appstream_XML): $(appstream_in_files) +	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@  # Tell versions [3.59,3.63) of GNU make to not export all variables.  # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am deleted file mode 100644 index 37b3e67..0000000 --- a/data/appdata/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -appdatadir = $(datadir)/appdata -appdata_DATA = simple-scan.appdata.xml -@INTLTOOL_XML_RULE@ - -EXTRA_DIST = simple-scan.appdata.xml.in - -DISTCLEANFILES = \ -	$(appdata_DATA) diff --git a/data/appdata/Makefile.in b/data/appdata/Makefile.in deleted file mode 100644 index 5bc8036..0000000 --- a/data/appdata/Makefile.in +++ /dev/null @@ -1,498 +0,0 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2014 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = { \ -  if test -z '$(MAKELEVEL)'; then \ -    false; \ -  elif test -n '$(MAKE_HOST)'; then \ -    true; \ -  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ -    true; \ -  else \ -    false; \ -  fi; \ -} -am__make_running_with_option = \ -  case $${target_option-} in \ -      ?) ;; \ -      *) echo "am__make_running_with_option: internal error: invalid" \ -              "target option '$${target_option-}' specified" >&2; \ -         exit 1;; \ -  esac; \ -  has_opt=no; \ -  sane_makeflags=$$MAKEFLAGS; \ -  if $(am__is_gnu_make); then \ -    sane_makeflags=$$MFLAGS; \ -  else \ -    case $$MAKEFLAGS in \ -      *\\[\ \	]*) \ -        bs=\\; \ -        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \ -    esac; \ -  fi; \ -  skip_next=no; \ -  strip_trailopt () \ -  { \ -    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -  }; \ -  for flg in $$sane_makeflags; do \ -    test $$skip_next = yes && { skip_next=no; continue; }; \ -    case $$flg in \ -      *=*|--*) continue;; \ -        -*I) strip_trailopt 'I'; skip_next=yes;; \ -      -*I?*) strip_trailopt 'I';; \ -        -*O) strip_trailopt 'O'; skip_next=yes;; \ -      -*O?*) strip_trailopt 'O';; \ -        -*l) strip_trailopt 'l'; skip_next=yes;; \ -      -*l?*) strip_trailopt 'l';; \ -      -[dEDm]) skip_next=yes;; \ -      -[JT]) skip_next=yes;; \ -    esac; \ -    case $$flg in \ -      *$$target_option*) has_opt=yes; break;; \ -    esac; \ -  done; \ -  test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = data/appdata -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ -	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ -	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \ -	$(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -	$(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo "  GEN     " $@; -am__v_GEN_1 =  -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 =  -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ -  case $$AM_UPDATE_INFO_DIR in \ -    n|no|NO) false;; \ -    *) (install-info --version) >/dev/null 2>&1;; \ -  esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ -    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -    *) f=$$p;; \ -  esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ -  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ -  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ -  for p in $$list; do echo "$$p $$p"; done | \ -  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -    if (++n[$$2] == $(am__install_max)) \ -      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -    END { for (dir in files) print dir, files[dir] }' -am__base_list = \ -  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ -  test -z "$$files" \ -    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -         $(am__cd) "$$dir" && rm -f $$files; }; \ -  } -am__installdirs = "$(DESTDIR)$(appdatadir)" -DATA = $(appdata_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -COLORD_CFLAGS = @COLORD_CFLAGS@ -COLORD_LIBS = @COLORD_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -ITSTOOL = @ITSTOOL@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@ -PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@ -SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VALAC = @VALAC@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -XMLLINT = @XMLLINT@ -YELP_LC_DIST = @YELP_LC_DIST@ -YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -runstatedir = @runstatedir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -appdatadir = $(datadir)/appdata -appdata_DATA = simple-scan.appdata.xml -EXTRA_DIST = simple-scan.appdata.xml.in -DISTCLEANFILES = \ -	$(appdata_DATA) - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps) -	@for dep in $?; do \ -	  case '$(am__configure_deps)' in \ -	    *$$dep*) \ -	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -	        && { if test -f $@; then exit 0; else break; fi; }; \ -	      exit 1;; \ -	  esac; \ -	done; \ -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/appdata/Makefile'; \ -	$(am__cd) $(top_srcdir) && \ -	  $(AUTOMAKE) --foreign data/appdata/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -	@case '$?' in \ -	  *config.status*) \ -	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -	  *) \ -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -	esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-appdataDATA: $(appdata_DATA) -	@$(NORMAL_INSTALL) -	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ -	if test -n "$$list"; then \ -	  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)$(appdatadir)'"; \ -	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ -	done - -uninstall-appdataDATA: -	@$(NORMAL_UNINSTALL) -	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ -	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -	list='$(DISTFILES)'; \ -	  dist_files=`for file in $$list; do echo $$file; done | \ -	  sed -e "s|^$$srcdirstrip/||;t" \ -	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -	case $$dist_files in \ -	  */*) $(MKDIR_P) `echo "$$dist_files" | \ -			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -			   sort -u` ;; \ -	esac; \ -	for file in $$dist_files; do \ -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -	  if test -d $$d/$$file; then \ -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -	    if test -d "$(distdir)/$$file"; then \ -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -	    fi; \ -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -	    fi; \ -	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -	  else \ -	    test -f "$(distdir)/$$file" \ -	    || cp -p $$d/$$file "$(distdir)/$$file" \ -	    || exit 1; \ -	  fi; \ -	done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: -	for dir in "$(DESTDIR)$(appdatadir)"; do \ -	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -	done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: -	if test -z '$(STRIP)'; then \ -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -	      install; \ -	else \ -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -	fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: -	@echo "This command is intended for maintainers to use" -	@echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am -	-rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-appdataDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am -	-rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-appdataDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ -	ctags-am distclean distclean-generic distdir dvi dvi-am html \ -	html-am info info-am install install-am install-appdataDATA \ -	install-data install-data-am install-dvi install-dvi-am \ -	install-exec install-exec-am install-html install-html-am \ -	install-info install-info-am install-man install-pdf \ -	install-pdf-am install-ps install-ps-am install-strip \ -	installcheck installcheck-am installdirs maintainer-clean \ -	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ -	pdf-am ps ps-am tags-am uninstall uninstall-am \ -	uninstall-appdataDATA - -.PRECIOUS: Makefile - -@INTLTOOL_XML_RULE@ - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index b3e2fec..09ceef4 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -85,11 +85,17 @@ POST_INSTALL = :  NORMAL_UNINSTALL = :  PRE_UNINSTALL = :  POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@  subdir = data/icons  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ -	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ -	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ +	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \ +	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ +	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ +	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \  	$(top_srcdir)/configure.ac  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \  	$(ACLOCAL_M4) @@ -120,9 +126,9 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)  am__DIST_COMMON = $(srcdir)/Makefile.in  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)  ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@  AMTAR = @AMTAR@  AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@  AUTOCONF = @AUTOCONF@  AUTOHEADER = @AUTOHEADER@  AUTOMAKE = @AUTOMAKE@ @@ -142,10 +148,12 @@ ECHO_N = @ECHO_N@  ECHO_T = @ECHO_T@  EGREP = @EGREP@  EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@  GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@  GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@  GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@  GREP = @GREP@  GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@  HELP_DIR = @HELP_DIR@ @@ -154,24 +162,23 @@ INSTALL_DATA = @INSTALL_DATA@  INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_SCRIPT = @INSTALL_SCRIPT@  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@  ITSTOOL = @ITSTOOL@  LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@  LIBOBJS = @LIBOBJS@  LIBS = @LIBS@  LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@  LTLIBOBJS = @LTLIBOBJS@  MAINT = @MAINT@  MAKEINFO = @MAKEINFO@  MKDIR_P = @MKDIR_P@  MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@  MSGMERGE = @MSGMERGE@  OBJEXT = @OBJEXT@  PACKAGE = @PACKAGE@ @@ -187,6 +194,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@  PKG_CONFIG = @PKG_CONFIG@  PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@  PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POSUB = @POSUB@ +SED = @SED@  SET_MAKE = @SET_MAKE@  SHELL = @SHELL@  SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@ @@ -196,6 +205,8 @@ USE_NLS = @USE_NLS@  VALAC = @VALAC@  VERSION = @VERSION@  XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  XMLLINT = @XMLLINT@  YELP_LC_DIST = @YELP_LC_DIST@  YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ @@ -209,8 +220,13 @@ am__leading_dot = @am__leading_dot@  am__quote = @am__quote@  am__tar = @am__tar@  am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@  bindir = @bindir@ +build = @build@  build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@  builddir = @builddir@  datadir = @datadir@  datarootdir = @datarootdir@ @@ -218,13 +234,15 @@ docdir = @docdir@  dvidir = @dvidir@  exec_prefix = @exec_prefix@  gsettingsschemadir = @gsettingsschemadir@ +host = @host@  host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@  htmldir = @htmldir@  includedir = @includedir@  infodir = @infodir@  install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@  libdir = @libdir@  libexecdir = @libexecdir@  localedir = @localedir@ diff --git a/data/org.gnome.SimpleScan.gschema.xml b/data/org.gnome.SimpleScan.gschema.xml new file mode 100644 index 0000000..fb38954 --- /dev/null +++ b/data/org.gnome.SimpleScan.gschema.xml @@ -0,0 +1,70 @@ +<schemalist> +  <enum id="org.gnome.SimpleScan.PageSide"> +    <value value="1" nick="front"/> +    <value value="2" nick="back"/> +    <value value="3" nick="both"/> +  </enum> + +  <schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan"> +    <key name="selected-device" type="s"> +      <default>''</default> +      <summary>Device to scan from</summary> +      <description>SANE device to acquire images from.</description> +    </key> +    <key name="document-type" type="s"> +      <default>'photo'</default> +      <choices> +        <choice value="text"/> +        <choice value="photo"/> +      </choices> +      <summary>Type of document being scanned</summary> +      <description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</description> +    </key> +    <key name="paper-width" type="i"> +      <default>0</default> +      <summary>Width of paper in tenths of a mm</summary> +      <description>The width of the paper in tenths of a mm (or 0 for automatic paper detection).</description> +    </key> +    <key name="paper-height" type="i"> +      <default>0</default> +      <summary>Height of paper in tenths of a mm</summary> +      <description>The height of the paper in tenths of a mm (or 0 for automatic paper detection).</description> +    </key> +    <key name="brightness" type="i"> +      <default>0</default> +      <summary>Brightness of scan</summary> +      <description>The brightness adjustment from -100 to 100 (0 being none).</description> +    </key> +    <key name="contrast" type="i"> +        <default>0</default> +        <summary>Contrast of scan</summary> +        <description>The contrast adjustment from -100 to 100 (0 being none).</description> +    </key> +    <key name="text-dpi" type="i"> +      <default>150</default> +      <summary>Resolution for text scans</summary> +      <description>The resolution in dots-per-inch to use when scanning text.</description> +    </key> +    <key name="photo-dpi" type="i"> +      <default>300</default> +      <summary>Resolution for photo scans</summary> +      <description>The resolution in dots-per-inch to use when scanning photos.</description> +    </key> +    <key name="page-side" enum="org.gnome.SimpleScan.PageSide"> +      <default>'both'</default> +      <summary>Page side to scan</summary> +      <description>The page side to scan.</description> +    </key> +    <key name="save-directory" type="s"> +      <default>''</default> +      <summary>Directory to save files to</summary> +      <description>The directory to save files to.  Defaults to the documents directory if unset.</description> +    </key> +    <key name="jpeg-quality" type="i"> +      <range min="0" max="100"/> +      <default>75</default> +      <summary>Quality value to use for JPEG compression</summary> +      <description>Quality value to use for JPEG compression.</description> +    </key> +  </schema> +</schemalist> diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in deleted file mode 100644 index 3ce3d12..0000000 --- a/data/org.gnome.SimpleScan.gschema.xml.in +++ /dev/null @@ -1,70 +0,0 @@ -<schemalist> -  <enum id="org.gnome.SimpleScan.PageSide"> -    <value value="1" nick="front"/> -    <value value="2" nick="back"/> -    <value value="3" nick="both"/> -  </enum> - -  <schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan"> -    <key name="selected-device" type="s"> -      <default>''</default> -      <_summary>Device to scan from</_summary> -      <_description>SANE device to acquire images from.</_description> -    </key> -    <key name="document-type" type="s"> -      <default>'photo'</default> -      <choices> -        <choice value="text"/> -        <choice value="photo"/> -      </choices> -      <_summary>Type of document being scanned</_summary> -      <_description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</_description> -    </key> -    <key name="paper-width" type="i"> -      <default>0</default> -      <_summary>Width of paper in tenths of a mm</_summary> -      <_description>The width of the paper in tenths of a mm (or 0 for automatic paper detection).</_description> -    </key> -    <key name="paper-height" type="i"> -      <default>0</default> -      <_summary>Height of paper in tenths of a mm</_summary> -      <_description>The height of the paper in tenths of a mm (or 0 for automatic paper detection).</_description> -    </key> -    <key name="brightness" type="i"> -      <default>0</default> -      <_summary>Brightness of scan</_summary> -      <_description>The brightness adjustment from -100 to 100 (0 being none).</_description> -    </key> -    <key name="contrast" type="i"> -        <default>0</default> -        <_summary>Contrast of scan</_summary> -        <_description>The contrast adjustment from -100 to 100 (0 being none).</_description> -    </key> -    <key name="text-dpi" type="i"> -      <default>150</default> -      <_summary>Resolution for text scans</_summary> -      <_description>The resolution in dots-per-inch to use when scanning text.</_description> -    </key> -    <key name="photo-dpi" type="i"> -      <default>300</default> -      <_summary>Resolution for photo scans</_summary> -      <_description>The resolution in dots-per-inch to use when scanning photos.</_description> -    </key> -    <key name="page-side" enum="org.gnome.SimpleScan.PageSide"> -      <default>'both'</default> -      <_summary>Page side to scan</_summary> -      <_description>The page side to scan.</_description> -    </key> -    <key name="save-directory" type="s"> -      <default>''</default> -      <_summary>Directory to save files to</_summary> -      <_description>The directory to save files to.  Defaults to the documents directory if unset.</_description> -    </key> -    <key name="jpeg-quality" type="i"> -      <range min="0" max="100"/> -      <default>75</default> -      <_summary>Quality value to use for JPEG compression</_summary> -      <_description>Quality value to use for JPEG compression.</_description> -    </key> -  </schema> -</schemalist> diff --git a/data/appdata/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in index 3a3d0ef..0d306cd 100644 --- a/data/appdata/simple-scan.appdata.xml.in +++ b/data/simple-scan.appdata.xml.in @@ -1,21 +1,24 @@  <?xml version="1.0" encoding="UTF-8"?> -<application> +<component type="desktop">    <id type="desktop">simple-scan.desktop</id>    <metadata_licence>CC0-1.0</metadata_licence>    <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license> -  <_name>Simple Scan</_name> +  <name>Simple Scan</name> +  <summary>Scan Documents</summary>    <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> +  <update_contact>robert.ancell_AT_canonical.com</update_contact> +  <translation type="gettext">simple-scan</translation> +</component> diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in index 08c2072..89edeb2 100644 --- a/data/simple-scan.desktop.in +++ b/data/simple-scan.desktop.in @@ -1,12 +1,11 @@  [Desktop Entry] -_Name=Simple Scan -_GenericName=Document Scanner -_Comment=Scan Documents -_Keywords=scan;scanner;flatbed;adf; +Name=Simple Scan +GenericName=Document Scanner +Comment=Scan Documents +Keywords=scan;scanner;flatbed;adf;  Exec=simple-scan  Icon=scanner  Terminal=false  Type=Application  StartupNotify=true  Categories=GNOME;GTK;Graphics;Scanning; -X-GNOME-Gettext-Domain=simple-scan | 
