From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Tue, 1 May 2018 14:34:32 +0200
Subject: New upstream version 0.28.2

---
 Makefile.am | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 93b929b..720cf2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = misc help po app-icons icons ui
 
-EXTRA_DIST = AUTHORS
+if INSTALL_APPORT_HOOK
+SUBDIRS += apport
+endif
+
+EXTRA_DIST = AUTHORS git-hash
 
 AUTHORS:
 	$(AM_V_GEN)if test -d "$(srcdir)/.git"; \
@@ -27,6 +31,7 @@ MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
 
 GITIGNOREFILES = \
+	build \
 	ABOUT-NLS \
 	plugins/**/*.h \
 	plugins/**/*.vapi \
@@ -53,6 +58,7 @@ lib_LTLIBRARIES = \
 
 plugins_common_libshotwell_plugin_common_la_SOURCES = \
 	plugins/common/RESTSupport.vala \
+	plugins/common/OAuth1Support.vala \
 	plugins/common/Resources.vala \
 	plugins/common/WebAuthenticationPane.vala \
 	plugins/common/BuilderPane.vala \
@@ -128,6 +134,7 @@ dist_noinst_DATA = $(NULL)
 MOSTLYCLEANFILES = $(NULL)
 
 include $(top_srcdir)/common.am
+include $(top_srcdir)/pipeline.am
 include $(top_srcdir)/shotwell.am
 include $(top_srcdir)/thumbnailer.am
 
@@ -142,7 +149,6 @@ include $(top_srcdir)/publish-extra.am
 endif
 
 include $(top_srcdir)/transition.am
-include $(top_srcdir)/import.am
 
 dist_noinst_SCRIPTS = \
 	autogen.sh
@@ -154,6 +160,41 @@ dist_noinst_DATA += \
 	vapi/libexif.vapi \
 	vapi/libgphoto2.vapi \
 	vapi/libraw.vapi \
-	vapi/unity.deps \
-	vapi/unity.vapi \
-	vapi/misc.vapi
+	vapi/misc.vapi \
+	app-icons/meson.build \
+	thumbnailer/meson.build \
+	meson.build \
+	po/meson.build \
+	apport/meson.build \
+	help/meson.build \
+	settings-migrator/meson.build \
+	misc/meson.build \
+	src/meson.build \
+	src/plugins/meson.build \
+	plugins/meson.build \
+	plugins/shotwell-publishing-extras/meson.build \
+	plugins/shotwell-publishing/meson.build \
+	plugins/authenticator/shotwell/meson.build \
+	plugins/authenticator/meson.build \
+	plugins/common/meson.build \
+	plugins/shotwell-transitions/meson.build \
+	meson_options.txt \
+	app-icons/meson.build \
+	apport/meson.build \
+	help/meson.build \
+	meson.build \
+	meson_options.txt \
+	misc/meson.build \
+	plugins/authenticator/meson.build \
+	plugins/authenticator/shotwell/meson.build \
+	plugins/common/meson.build \
+	plugins/meson.build \
+	plugins/shotwell-publishing-extras/meson.build \
+	plugins/shotwell-publishing/meson.build \
+	plugins/shotwell-transitions/meson.build \
+	po/meson.build \
+	settings-migrator/meson.build \
+	src/meson.build \
+	src/plugins/meson.build \
+	thumbnailer/meson.build \
+	apport/shotwell.py
-- 
cgit v1.2.3