From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- misc/Makefile.am | 7 ++----- misc/Makefile.in | 7 ++----- misc/meson.build | 28 ++++++++++++++++++++++++++++ misc/org.yorba.shotwell.gschema.xml | 14 +++++++++++++- misc/shotwell-viewer.desktop.in | 15 +++++++++++++++ misc/shotwell-viewer.desktop.in.in | 15 --------------- misc/shotwell.desktop.in | 17 +++++++++++++++++ misc/shotwell.desktop.in.in | 17 ----------------- 8 files changed, 77 insertions(+), 43 deletions(-) create mode 100644 misc/meson.build create mode 100644 misc/shotwell-viewer.desktop.in delete mode 100644 misc/shotwell-viewer.desktop.in.in create mode 100644 misc/shotwell.desktop.in delete mode 100644 misc/shotwell.desktop.in.in (limited to 'misc') diff --git a/misc/Makefile.am b/misc/Makefile.am index aa9a2bd..803697d 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -12,9 +12,6 @@ desktop_DATA = shotwell.desktop shotwell-viewer.desktop $(appstream_XML) : $(appstream_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 $@ @@ -24,8 +21,8 @@ $(appstream_XML) : $(appstream_in_files) CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files) dist_noinst_DATA = \ - $(srcdir)/shotwell.desktop.in.in \ - $(srcdir)/shotwell-viewer.desktop.in.in \ + $(srcdir)/shotwell.desktop.in \ + $(srcdir)/shotwell-viewer.desktop.in \ $(gsettings_SCHEMAS) \ $(appstream_in_files) diff --git a/misc/Makefile.in b/misc/Makefile.in index 0571904..9469c4b 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -353,8 +353,8 @@ desktopdir = $(datadir)/applications desktop_DATA = shotwell.desktop shotwell-viewer.desktop CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files) dist_noinst_DATA = \ - $(srcdir)/shotwell.desktop.in.in \ - $(srcdir)/shotwell-viewer.desktop.in.in \ + $(srcdir)/shotwell.desktop.in \ + $(srcdir)/shotwell-viewer.desktop.in \ $(gsettings_SCHEMAS) \ $(appstream_in_files) @@ -579,9 +579,6 @@ uninstall-am: uninstall-desktopDATA $(appstream_XML) : $(appstream_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 $@ diff --git a/misc/meson.build b/misc/meson.build new file mode 100644 index 0000000..664ddb0 --- /dev/null +++ b/misc/meson.build @@ -0,0 +1,28 @@ +podir = join_paths('..', 'po') + +i18n.merge_file(input : 'shotwell.appdata.xml.in', + output : 'shotwell.appdata.xml', + po_dir : join_paths('..', 'po'), + type : 'xml', + install: true, + install_dir : join_paths(get_option('datadir'), 'metainfo')) + +i18n.merge_file(input : 'shotwell.desktop.in', + output: 'shotwell.desktop', + po_dir : podir, + type : 'desktop', + install : true, + install_dir : join_paths(get_option('datadir'), 'applications')) + +i18n.merge_file(input : 'shotwell-viewer.desktop.in', + output: 'shotwell-viewer.desktop', + po_dir : podir, + type : 'desktop', + install : true, + install_dir : join_paths(get_option('datadir'), 'applications')) + +install_data(['org.yorba.shotwell-extras.gschema.xml', + 'org.yorba.shotwell.gschema.xml'], + install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'schemas')) + +gnome.compile_schemas() diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml index afd2f02..2bd9003 100644 --- a/misc/org.yorba.shotwell.gschema.xml +++ b/misc/org.yorba.shotwell.gschema.xml @@ -161,7 +161,19 @@ background color A grayscale color for use as the background color. - + + + 'checkered' + background for transparent images + The background to use for transparent images. + + + + '#444' + color for solid transparency background + Color to use if background for transparent images is set to solid color + + false Selection state of “hide photos” option diff --git a/misc/shotwell-viewer.desktop.in b/misc/shotwell-viewer.desktop.in new file mode 100644 index 0000000..b5e41f3 --- /dev/null +++ b/misc/shotwell-viewer.desktop.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-viewer.desktop.in.in b/misc/shotwell-viewer.desktop.in.in deleted file mode 100644 index b5e41f3..0000000 --- a/misc/shotwell-viewer.desktop.in.in +++ /dev/null @@ -1,15 +0,0 @@ -[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.desktop.in b/misc/shotwell.desktop.in new file mode 100644 index 0000000..aa1ede2 --- /dev/null +++ b/misc/shotwell.desktop.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 diff --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in.in deleted file mode 100644 index aa1ede2..0000000 --- a/misc/shotwell.desktop.in.in +++ /dev/null @@ -1,17 +0,0 @@ -[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