From 3c829c50a8f705402bdc759946d49ae7caebd003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 13 Aug 2017 14:58:35 +0200 Subject: New upstream version 0.26.3 --- misc/Makefile.am | 2 +- misc/Makefile.in | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/Makefile.am b/misc/Makefile.am index 6376879..711b06f 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -19,7 +19,7 @@ $(appdata_XML) : $(appdata_in_files) $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ @GSETTINGS_RULES@ -@APPDATA_XML_RULES@ +@APPSTREAM_XML_RULES@ CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files) diff --git a/misc/Makefile.in b/misc/Makefile.in index ece7535..36072f4 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -90,7 +90,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = misc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_generate_changelog.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.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 \ @@ -297,7 +298,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -585,7 +586,7 @@ $(appdata_XML) : $(appdata_in_files) $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ @GSETTINGS_RULES@ -@APPDATA_XML_RULES@ +@APPSTREAM_XML_RULES@ -include $(top_srcdir)/git.mk -- cgit v1.2.3 From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- misc/Makefile.am | 10 +++++----- misc/Makefile.in | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'misc') diff --git a/misc/Makefile.am b/misc/Makefile.am index 711b06f..aa9a2bd 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -2,14 +2,14 @@ gsettings_SCHEMAS = \ org.yorba.shotwell.gschema.xml \ org.yorba.shotwell-extras.gschema.xml -appdata_in_files = $(srcdir)/shotwell.appdata.xml.in -appdata_XML = \ +appstream_in_files = $(srcdir)/shotwell.appdata.xml.in +appstream_XML = \ shotwell.appdata.xml desktopdir = $(datadir)/applications desktop_DATA = shotwell.desktop shotwell-viewer.desktop -$(appdata_XML) : $(appdata_in_files) +$(appstream_XML) : $(appstream_in_files) $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ %.desktop.in : %.desktop.in.in @@ -21,12 +21,12 @@ $(appdata_XML) : $(appdata_in_files) @GSETTINGS_RULES@ @APPSTREAM_XML_RULES@ -CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files) +CLEANFILES = $(appstream_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) + $(appstream_in_files) -include $(top_srcdir)/git.mk diff --git a/misc/Makefile.in b/misc/Makefile.in index 36072f4..0571904 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -345,18 +345,18 @@ gsettings_SCHEMAS = \ org.yorba.shotwell.gschema.xml \ org.yorba.shotwell-extras.gschema.xml -appdata_in_files = $(srcdir)/shotwell.appdata.xml.in -appdata_XML = \ +appstream_in_files = $(srcdir)/shotwell.appdata.xml.in +appstream_XML = \ shotwell.appdata.xml desktopdir = $(datadir)/applications desktop_DATA = shotwell.desktop shotwell-viewer.desktop -CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files) +CLEANFILES = $(appstream_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) + $(appstream_in_files) all: all-am @@ -576,7 +576,7 @@ uninstall-am: uninstall-desktopDATA .PRECIOUS: Makefile -$(appdata_XML) : $(appdata_in_files) +$(appstream_XML) : $(appstream_in_files) $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ %.desktop.in : %.desktop.in.in -- cgit v1.2.3