From 143bfc9f801c84428074312d661f8e08803df83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Aug 2016 15:09:31 +0200 Subject: Imported Upstream version 0.23.5 --- misc/Makefile.am | 32 ++ misc/Makefile.in | 592 +++++++++++++++++++++++++++++ misc/org.yorba.shotwell-extras.gschema.xml | 2 +- misc/org.yorba.shotwell.gschema.xml | 10 +- misc/shotwell-viewer.desktop.head | 14 - misc/shotwell-viewer.desktop.in.in | 15 + misc/shotwell.appdata.xml | 34 -- misc/shotwell.appdata.xml.in | 60 +++ misc/shotwell.convert | 105 ----- misc/shotwell.desktop.head | 15 - misc/shotwell.desktop.in.in | 17 + 11 files changed, 725 insertions(+), 171 deletions(-) create mode 100644 misc/Makefile.am create mode 100644 misc/Makefile.in delete mode 100644 misc/shotwell-viewer.desktop.head create mode 100644 misc/shotwell-viewer.desktop.in.in delete mode 100644 misc/shotwell.appdata.xml create mode 100644 misc/shotwell.appdata.xml.in delete mode 100644 misc/shotwell.convert delete mode 100644 misc/shotwell.desktop.head create mode 100644 misc/shotwell.desktop.in.in (limited to 'misc') diff --git a/misc/Makefile.am b/misc/Makefile.am new file mode 100644 index 0000000..6376879 --- /dev/null +++ b/misc/Makefile.am @@ -0,0 +1,32 @@ +gsettings_SCHEMAS = \ + org.yorba.shotwell.gschema.xml \ + org.yorba.shotwell-extras.gschema.xml + +appdata_in_files = $(srcdir)/shotwell.appdata.xml.in +appdata_XML = \ + shotwell.appdata.xml + +desktopdir = $(datadir)/applications +desktop_DATA = shotwell.desktop shotwell-viewer.desktop + +$(appdata_XML) : $(appdata_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ + +%.desktop.in : %.desktop.in.in + $(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@ + +%.desktop : %.desktop.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +@GSETTINGS_RULES@ +@APPDATA_XML_RULES@ + +CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files) + +dist_noinst_DATA = \ + $(srcdir)/shotwell.desktop.in.in \ + $(srcdir)/shotwell-viewer.desktop.in.in \ + $(gsettings_SCHEMAS) \ + $(appdata_in_files) + +-include $(top_srcdir)/git.mk diff --git a/misc/Makefile.in b/misc/Makefile.in new file mode 100644 index 0000000..b69d514 --- /dev/null +++ b/misc/Makefile.in @@ -0,0 +1,592 @@ +# 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 = : +build_triplet = @build@ +host_triplet = @host@ +subdir = misc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_generate_changelog.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.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/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +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)$(desktopdir)" +DATA = $(desktop_DATA) $(dist_noinst_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@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +API_VERSION = @API_VERSION@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIT = @GIT@ +GITVER = @GITVER@ +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@ +HAVE_EXTRA_PLUGINS = @HAVE_EXTRA_PLUGINS@ +HAVE_UNITY = @HAVE_UNITY@ +HELP_DIR = @HELP_DIR@ +IMPORT_CFLAGS = @IMPORT_CFLAGS@ +IMPORT_LIBS = @IMPORT_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +ITSTOOL = @ITSTOOL@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAJOR_VERSION = @MAJOR_VERSION@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MICRO_VERSION = @MICRO_VERSION@ +MINOR_VERSION = @MINOR_VERSION@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +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@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LIBS = @PLUGIN_LIBS@ +POSUB = @POSUB@ +PUBLISHING_CFLAGS = @PUBLISHING_CFLAGS@ +PUBLISHING_LIBS = @PUBLISHING_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SHOTWELL_CFLAGS = @SHOTWELL_CFLAGS@ +SHOTWELL_LIBS = @SHOTWELL_LIBS@ +STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TRANSITIONS_CFLAGS = @TRANSITIONS_CFLAGS@ +TRANSITIONS_LIBS = @TRANSITIONS_LIBS@ +UNITY_CFLAGS = @UNITY_CFLAGS@ +UNITY_LIBS = @UNITY_LIBS@ +UNITY_VALAFLAGS = @UNITY_VALAFLAGS@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VALAFLAGS = @VALAFLAGS@ +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@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +appdataxmldir = @appdataxmldir@ +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@ +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@ +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@ +gsettings_SCHEMAS = \ + org.yorba.shotwell.gschema.xml \ + org.yorba.shotwell-extras.gschema.xml + +appdata_in_files = $(srcdir)/shotwell.appdata.xml.in +appdata_XML = \ + shotwell.appdata.xml + +desktopdir = $(datadir)/applications +desktop_DATA = shotwell.desktop shotwell-viewer.desktop +CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files) +dist_noinst_DATA = \ + $(srcdir)/shotwell.desktop.in.in \ + $(srcdir)/shotwell-viewer.desktop.in.in \ + $(gsettings_SCHEMAS) \ + $(appdata_in_files) + +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 misc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign misc/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): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + 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)$(desktopdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(desktopdir)'; $(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)$(desktopdir)"; 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: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +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) + +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 clean-libtool 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-desktopDATA + +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 mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-desktopDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am 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-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-desktopDATA + +.PRECIOUS: Makefile + + +$(appdata_XML) : $(appdata_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ + +%.desktop.in : %.desktop.in.in + $(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@ + +%.desktop : %.desktop.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +@GSETTINGS_RULES@ +@APPDATA_XML_RULES@ + +-include $(top_srcdir)/git.mk + +# 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/misc/org.yorba.shotwell-extras.gschema.xml b/misc/org.yorba.shotwell-extras.gschema.xml index 3506f12..e31f67a 100644 --- a/misc/org.yorba.shotwell-extras.gschema.xml +++ b/misc/org.yorba.shotwell-extras.gschema.xml @@ -1,4 +1,4 @@ - + diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml index 1f6a093..16ba868 100644 --- a/misc/org.yorba.shotwell.gschema.xml +++ b/misc/org.yorba.shotwell.gschema.xml @@ -1,4 +1,4 @@ - + @@ -35,6 +35,12 @@ True if the sidebar is to be displayed, false otherwise. + + true + display toolbar + True if the bottom toolbar is to be displayed, false otherwise. + + false display search bar @@ -427,7 +433,7 @@ "" - Piwigio URL + Piwigo URL URL of the Piwigo server. diff --git a/misc/shotwell-viewer.desktop.head b/misc/shotwell-viewer.desktop.head deleted file mode 100644 index 994bc18..0000000 --- a/misc/shotwell-viewer.desktop.head +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Shotwell Viewer -GenericName=Photo Viewer -Exec=shotwell %f -Icon=shotwell -Terminal=false -NoDisplay=true -Type=Application -MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f; -Categories=Graphics;Viewer;Photography;GNOME;GTK; -X-GIO-NoFuse=true -X-GNOME-Gettext-Domain=shotwell -X-GNOME-FullName=Shotwell Photo Viewer diff --git a/misc/shotwell-viewer.desktop.in.in b/misc/shotwell-viewer.desktop.in.in new file mode 100644 index 0000000..b5e41f3 --- /dev/null +++ b/misc/shotwell-viewer.desktop.in.in @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Name=Shotwell Viewer +GenericName=Photo Viewer +Exec=shotwell %f +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=shotwell +Terminal=false +NoDisplay=true +Type=Application +MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f; +Categories=Graphics;Viewer;Photography;GNOME;GTK; +X-GIO-NoFuse=true +X-GNOME-Gettext-Domain=shotwell +X-GNOME-FullName=Shotwell Photo Viewer diff --git a/misc/shotwell.appdata.xml b/misc/shotwell.appdata.xml deleted file mode 100644 index 62b9a57..0000000 --- a/misc/shotwell.appdata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - shotwell.desktop - CC0 - LGPL-2.1+ - Popular photo manager - -

- Shotwell is an easy-to-use, fast photo organizer designed for the GNOME desktop. - It allows you to import photos from your camera or disk, organize them by date and subject - matter, even ratings. It also offers basic photo editing, like crop, red-eye correction, - color adjustments, and straighten. Shotwell's non-destructive photo editor does not alter - your master photos, making it easy to experiment and correct errors. -

-

- When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, - Picasa (Google Plus), and more. -

-

- Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats. -

- - https://wiki.gnome.org/Apps/Shotwell - - http://www.yorba.org/wp-content/uploads/2013/02/harbor.png - http://www.yorba.org/wp-content/uploads/2013/02/import-300x155.png - http://www.yorba.org/wp-content/uploads/2013/02/organize-300x197.png - http://www.yorba.org/wp-content/uploads/2013/02/edit-300x247.png - http://www.yorba.org/wp-content/uploads/2013/02/publish-300x213.png - - shotwell@yorba.org - GNOME - diff --git a/misc/shotwell.appdata.xml.in b/misc/shotwell.appdata.xml.in new file mode 100644 index 0000000..955ec1c --- /dev/null +++ b/misc/shotwell.appdata.xml.in @@ -0,0 +1,60 @@ + + + + shotwell.desktop + CC0-1.0 + LGPL-2.1+ + shotwell + Shotwell + Popular photo manager + +

+ Shotwell is an easy-to-use, fast photo organizer designed for the GNOME desktop. + It allows you to import photos from your camera or disk, organize them by date and subject + matter, even ratings. It also offers basic photo editing, like crop, red-eye correction, + color adjustments, and straighten. Shotwell's non-destructive photo editor does not alter + your master photos, making it easy to experiment and correct errors. +

+

+ When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, + Picasa (Google Plus), and more. +

+

+ Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats. +

+ + https://wiki.gnome.org/Apps/Shotwell + + + http://shotwell-project.org/appdata/shotwell/harbor.png + + + + http://shotwell-project.org/appdata/shotwell/import-300x155.png + + + + http://shotwell-project.org/appdata/shotwell/organize-300x197.png + + + + http://shotwell-project.org/appdata/shotwell/edit-300x247.png + + + + http://shotwell-project.org/appdata/shotwell/publish-300x213.png + + + + mail@jensge.org + GNOME + + The Shotwell developers + + https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell + + + http://www.gnome.org/friends/ + + http://shotwell-project.org/doc/html + diff --git a/misc/shotwell.convert b/misc/shotwell.convert deleted file mode 100644 index 2f972c1..0000000 --- a/misc/shotwell.convert +++ /dev/null @@ -1,105 +0,0 @@ -[org.yorba.shotwell.preferences.ui] -background-color = /apps/shotwell/preferences/ui/background_color -display-basic-properties = /apps/shotwell/preferences/ui/display_basic_properties -display-extended-properties = /apps/shotwell/preferences/ui/display_extended_properties -display-photo-ratings = /apps/shotwell/preferences/ui/display_photo_ratings -display-photo-tags = /apps/shotwell/preferences/ui/display_photo_tags -display-photo-titles = /apps/shotwell/preferences/ui/display_photo_titles -event-photos-sort-ascending = /apps/shotwell/preferences/ui/event_photos_sort_ascending -event-photos-sort-by = /apps/shotwell/preferences/ui/event_photos_sort_by -events-sort-ascending = /apps/shotwell/preferences/ui/events_sort_ascending -hide-photos-already-imported = /apps/shotwell/preferences/ui/hide_photos_already_imported -keep-relativity = /apps/shotwell/preferences/ui/keep_relativity -library-photos-sort-ascending = /apps/shotwell/preferences/ui/library_photos_sort_ascending -library-photos-sort-by = /apps/shotwell/preferences/ui/library_photos_sort_by -modify-originals = /apps/shotwell/preferences/ui/modify_originals -photo-thumbnail-scale = /apps/shotwell/preferences/ui/photo_thumbnail_scale -show-welcome-dialog = /apps/shotwell/preferences/ui/show_welcome_dialog -sidebar-position = /apps/shotwell/preferences/ui/pane_position -use-24-hour-time = /apps/shotwell/preferences/ui/twentyfour_hr_time - -[org.yorba.shotwell.preferences.slideshow] -delay = /apps/shotwell/preferences/slideshow/delay -transition-delay = /apps/shotwell/preferences/slideshow_transition/delay -transition-effect-id = /apps/shotwell/preferences/slideshow_transition/name -show-title = /apps/shotwell/preferences/slideshow/show-title - -[org.yorba.shotwell.preferences.window] -direct-height = /apps/shotwell/preferences/window/direct_height -direct-maximize = /apps/shotwell/preferences/window/direct_maximize -direct-width = /apps/shotwell/preferences/window/direct_width -library-height = /apps/shotwell/preferences/window/library_height -library-maximize = /apps/shotwell/preferences/window/library_maximize -library-width = /apps/shotwell/preferences/window/library_width - -[org.yorba.shotwell.preferences.files] -auto-import = /apps/shotwell/preferences/files/auto_import -commit-metadata = /apps/shotwell/preferences/files/commit_metadata -directory-pattern = /apps/shotwell/preferences/files/directory_pattern -directory-pattern-custom = /apps/shotwell/preferences/files/directory_pattern_custom -import-dir = /apps/shotwell/preferences/files/import_dir -use-lowercase-filenames = /apps/shotwell/preferences/files/use_lowercase_filenames -raw-developer-default = /apps/shotwell/preferences/files/raw_developer_default - -[org.yorba.shotwell.preferences.editing] -external-photo-editor = /apps/shotwell/preferences/editing/external_photo_editor -external-raw-editor = /apps/shotwell/preferences/editing/external_raw_editor - -[org.yorba.shotwell.video] -interpreter-state-cookie = /apps/shotwell/video/interpreter_state_cookie - -[org.yorba.shotwell.printing] -content-height = /apps/shotwell/printing/content_height -content-layout = /apps/shotwell/printing/content_layout -content-ppi = /apps/shotwell/printing/content_ppi -content-units = /apps/shotwell/printing/content_units -content-width = /apps/shotwell/printing/content_width -images-per-page = /apps/shotwell/printing/images_per_page_selection -match-aspect-ratio = /apps/shotwell/printing/match_aspect_ratio -print-titles = /apps/shotwell/printing/print_titles -size-selection = /apps/shotwell/printing/size_selection -titles-font = /apps/shotwell/printing/print_titles_font - -[org.yorba.shotwell.sharing] -default-service = /apps/shotwell/sharing/default_service -last-used-service = /apps/shotwell/sharing/last_used_service - -[org.yorba.shotwell.plugins.enable-state] -publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled -publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled -publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled -publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled -publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled -publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled -transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled -transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled -transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled - -[org.yorba.shotwell.sharing.facebook] -uid = /apps/shotwell/sharing/facebook/uid -user-name = /apps/shotwell/sharing/facebook/user_name -default-size = /apps/shotwell/sharing/facebook/default_size - -[org.yorba.shotwell.sharing.flickr] -default-size = /apps/shotwell/sharing/flickr/default_size -visibility = /apps/shotwell/sharing/flickr/visibility - -[org.yorba.shotwell.sharing.picasa] -default-size = /apps/shotwell/sharing/picasa/default_size -last-album = /apps/shotwell/sharing/picasa/last_album - -[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo] -url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url -username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username -password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/password -remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password -last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category -last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level - -[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki] -auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token - -[org.yorba.shotwell.sharing.youtube] -user-name = /apps/shotwell/sharing/youtube/user_name -auth-token = /apps/shotwell/sharing/youtube/auth_token - diff --git a/misc/shotwell.desktop.head b/misc/shotwell.desktop.head deleted file mode 100644 index 09ca9ed..0000000 --- a/misc/shotwell.desktop.head +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Shotwell -GenericName=Photo Manager -Comment=Organize your photos -Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo; -Exec=shotwell %U -Icon=shotwell -Terminal=false -Type=Application -MimeType=x-content/image-dcf; -Categories=Graphics;Photography;GNOME;GTK; -X-GIO-NoFuse=true -X-GNOME-Gettext-Domain=shotwell -X-GNOME-FullName=Shotwell Photo Manager diff --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in.in new file mode 100644 index 0000000..aa1ede2 --- /dev/null +++ b/misc/shotwell.desktop.in.in @@ -0,0 +1,17 @@ +[Desktop Entry] +Version=1.0 +Name=Shotwell +GenericName=Photo Manager +Comment=Organize your photos +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo; +Exec=shotwell %U +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=shotwell +Terminal=false +Type=Application +MimeType=x-content/image-dcf; +Categories=Graphics;Photography;GNOME;GTK; +X-GIO-NoFuse=true +X-GNOME-Gettext-Domain=shotwell +X-GNOME-FullName=Shotwell Photo Manager -- cgit v1.2.3