Merge branch 'feature/upstream' into develop

1 files changed, 62 insertions, 36 deletions

diff --git a/configure b/configure
index 89983b8..bf5c2de 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shotwell 0.26.4.
+# Generated by GNU Autoconf 2.69 for shotwell 0.28.2.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell>.
 #
@@ -650,8 +650,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shotwell'
 PACKAGE_TARNAME='shotwell'
-PACKAGE_VERSION='0.26.4'
-PACKAGE_STRING='shotwell 0.26.4'
+PACKAGE_VERSION='0.28.2'
+PACKAGE_STRING='shotwell 0.28.2'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -730,6 +730,8 @@ HAVE_EXTRA_PLUGINS_FALSE
 HAVE_EXTRA_PLUGINS_TRUE
 HAVE_EXTRA_PLUGINS
 PUBLISHER_VALAFLAGS
+INSTALL_APPORT_HOOK_FALSE
+INSTALL_APPORT_HOOK_TRUE
 HAVE_UNITY_FALSE
 HAVE_UNITY_TRUE
 HAVE_UNITY
@@ -909,6 +911,7 @@ with_libintl_prefix
 enable_schemas_compile
 with_authenticator
 enable_unity_support
+enable_apport_hook
 enable_publishers
 enable_extra_plugins
 enable_shared
@@ -1502,7 +1505,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures shotwell 0.26.4 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.28.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1573,7 +1576,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.26.4:";;
+     short | recursive ) echo "Configuration of shotwell 0.28.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1597,9 +1600,10 @@ Optional Features:
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
   --enable-unity-support  Enable Ubuntu Unity integration
+  --enable-apport-hook    Install apport hook
   --enable-publishers=[list-of-publishers or all]
                           A comma-separated list of publishers from
-                          facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex
+                          facebook, flickr, picasa, piwigo, youtube, gallery3, tumblr
   --disable-extra-plugins Enable building and installation of extra publishing
                           plugins
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1746,7 +1750,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.26.4
+shotwell configure 0.28.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2024,7 +2028,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shotwell $as_me 0.26.4, which was
+It was created by shotwell $as_me 0.28.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2483,14 +2487,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 MAJOR_VERSION=0
 
-MINOR_VERSION=26
+MINOR_VERSION=28
 
-MICRO_VERSION=4
+MICRO_VERSION=2
 
 API_VERSION=0
 
 
-GITVER=5bd7d9a736997289de10c3bcdbaa089955e46233
+GITVER=4125c3461149ddec7fb58f58390a5c052eb7f1fc
 
 
  if test "x$GITVER" != "x"; then
@@ -2988,7 +2992,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.26.4'
+ VERSION='0.28.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8000,7 +8004,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8018,7 +8022,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8039,7 +8043,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8068,7 +8072,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8086,7 +8090,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8107,7 +8111,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8145,7 +8149,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8164,7 +8168,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8186,7 +8190,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8234,14 +8238,14 @@ if test -n "$THUMBNAILER_CFLAGS"; then
     pkg_cv_THUMBNAILER_CFLAGS="$THUMBNAILER_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  pkg_cv_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8254,14 +8258,14 @@ if test -n "$THUMBNAILER_LIBS"; then
     pkg_cv_THUMBNAILER_LIBS="$THUMBNAILER_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  pkg_cv_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8283,16 +8287,16 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>&1`
         else
-	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$THUMBNAILER_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+	as_fn_error $? "Package requirements (gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0) were not met:
 
 $THUMBNAILER_PKG_ERRORS
@@ -8945,18 +8949,35 @@ else
 fi
 
 
+# Check whether --enable-apport-hook was given.
+if test "${enable_apport_hook+set}" = set; then :
+  enableval=$enable_apport_hook;
+else
+  enable_apport_hook=no
+fi
+
+
+ if test "x$enable_apport_hook" != "xno"; then
+  INSTALL_APPORT_HOOK_TRUE=
+  INSTALL_APPORT_HOOK_FALSE='#'
+else
+  INSTALL_APPORT_HOOK_TRUE='#'
+  INSTALL_APPORT_HOOK_FALSE=
+fi
+
+
 
 
 # Check whether --enable-publishers was given.
 if test "${enable_publishers+set}" = set; then :
   enableval=$enable_publishers;
 else
-  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex"
+  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, tumblr"
 fi
 
 
 if test "$xenable_publishers" = "xall"; then :
-  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex"
+  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, tumblr"
 fi
 
 save_ifs=$IFS
@@ -17145,7 +17166,7 @@ else
 fi
 fi
 
-  appstreamxmldir=${datadir}/appdata
+  appstreamxmldir=${datadir}/metainfo
 
 
   APPSTREAM_XML_RULES='
@@ -17193,7 +17214,7 @@ clean-appstream-xml:
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 
 
-ac_config_files="$ac_config_files Makefile misc/Makefile po/Makefile.in help/Makefile app-icons/Makefile icons/Makefile ui/Makefile"
+ac_config_files="$ac_config_files Makefile misc/Makefile po/Makefile.in help/Makefile app-icons/Makefile icons/Makefile ui/Makefile apport/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17360,6 +17381,10 @@ if test -z "${HAVE_UNITY_TRUE}" && test -z "${HAVE_UNITY_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_UNITY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${INSTALL_APPORT_HOOK_TRUE}" && test -z "${INSTALL_APPORT_HOOK_FALSE}"; then
+  as_fn_error $? "conditional \"INSTALL_APPORT_HOOK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_EXTRA_PLUGINS_TRUE}" && test -z "${HAVE_EXTRA_PLUGINS_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_EXTRA_PLUGINS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17761,7 +17786,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shotwell $as_me 0.26.4, which was
+This file was extended by shotwell $as_me 0.28.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17827,7 +17852,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shotwell config.status 0.26.4
+shotwell config.status 0.28.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18258,6 +18283,7 @@ do
     "app-icons/Makefile") CONFIG_FILES="$CONFIG_FILES app-icons/Makefile" ;;
     "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
     "ui/Makefile") CONFIG_FILES="$CONFIG_FILES ui/Makefile" ;;
+    "apport/Makefile") CONFIG_FILES="$CONFIG_FILES apport/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac