shotwell-1:0.23.5-1.nonprism1: updating version

2 files changed, 106 insertions, 88 deletions

diff --git a/nonprism/shotwell/PKGBUILD b/nonprism/shotwell/PKGBUILD
index 0954ea9ab..6a62b3efb 100644
--- a/nonprism/shotwell/PKGBUILD
+++ b/nonprism/shotwell/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183722 2016-07-22 14:52:08Z spupykin $
+# $Id: PKGBUILD 186868 2016-08-16 17:32:00Z spupykin $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
@@ -7,7 +7,7 @@
 
 pkgname=shotwell
 epoch=1
-pkgver=0.23.4
+pkgver=0.23.5
 _basever=$(echo $pkgver | cut -f1-2 -d.)
 pkgrel=1.nonprism1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols"
@@ -22,8 +22,8 @@ depends=('libgee' 'webkit2gtk' 'libgexiv2' 'libraw' 'rest'
 makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils' 'itstool')
 source=("https://download.gnome.org/sources/shotwell/${_basever}/shotwell-$pkgver.tar.xz"
         'nonprism.patch')
-md5sums=('3f32c21bb3e7a2154be9585201fb7c4a'
-         '1466063535ce333efbf8d9c3407f5da5')
+md5sums=('4795be91d2f5adfb00641ba03435131b'
+         'e4e087d9506ae30dc4f6805690d4b9f2')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -39,7 +39,7 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexec=/usr/lib/shotwell \
+  ./configure --prefix=/usr --libexec=/usr/lib \
 	--disable-schemas-compile \
 	--disable-desktop-update \
 	--disable-icon-update \
diff --git a/nonprism/shotwell/nonprism.patch b/nonprism/shotwell/nonprism.patch
index e12c001f4..097f4c972 100644
--- a/nonprism/shotwell/nonprism.patch
+++ b/nonprism/shotwell/nonprism.patch
@@ -1,18 +1,20 @@
 diff --git a/Makefile.in b/Makefile.in
-index 432edaa..8496146 100644
+index fe97449..0e66f6b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -201,8 +201,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_DEPENDENCIES =
- am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo \
- 	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.lo \
- 	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo \
--	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo \
--	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo
- plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = $(am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS)
+@@ -227,9 +227,7 @@ am__plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES_DIS
+ @HAVE_EXTRA_PLUGINS_TRUE@am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo \
+ @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.lo \
+ @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo \
+-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo \
+-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo
+-@HAVE_EXTRA_PLUGINS_TRUE@nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo
++@HAVE_EXTRA_PLUGINS_TRUE@nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo \
+ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = $(am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) \
+ 	$(nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS)
  plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK =  \
- 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -214,10 +212,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK =  \
- plugins_shotwell_publishing_shotwell_publishing_la_DEPENDENCIES =  \
+@@ -245,10 +243,6 @@ plugins_shotwell_publishing_shotwell_publishing_la_DEPENDENCIES =  \
+ 	$(am__DEPENDENCIES_1) \
  	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
  am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo \
 -	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo \
@@ -20,9 +22,39 @@ index 432edaa..8496146 100644
 -	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo \
 -	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo \
  	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo
- plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = $(am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS)
- plugins_shotwell_publishing_shotwell_publishing_la_LINK = $(LIBTOOL) \
-@@ -604,14 +598,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ nodist_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-resource.lo
+ plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = $(am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS) \
+@@ -572,18 +566,9 @@ am__can_run_installinfo = \
+     n|no|NO) false;; \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
+-am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/facebook.png \
+-	plugins/shotwell-publishing/flickr.png \
+-	plugins/shotwell-publishing/picasa.png \
+-	plugins/shotwell-publishing/piwigo.png \
+-	plugins/shotwell-publishing/youtube.png \
+-	plugins/shotwell-publishing/facebook_publishing_options_pane.ui \
+-	plugins/shotwell-publishing/flickr_pin_entry_pane.ui \
+-	plugins/shotwell-publishing/flickr_publishing_options_pane.ui \
+-	plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
++am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/piwigo.png \
+ 	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
+ 	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
+-	plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
+ 	plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \
+ 	plugins/shotwell-publishing-extras/gallery3.png \
+ 	plugins/shotwell-publishing-extras/rajce.png \
+@@ -592,9 +577,6 @@ am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/facebook.png \
+ 	plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \
+ 	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \
+ 	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
+-	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
+-	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
+-	plugins/shotwell-publishing-extras/yandex_publish_model.ui \
+ 	plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml \
+ 	plugins/shotwell-transitions/slideshow-plugin.png \
+ 	plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml \
+@@ -676,14 +658,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	plugins/shotwell-data-imports/shotwell-data-imports.c \
  	plugins/shotwell-publishing-extras/GalleryConnector.c \
  	plugins/shotwell-publishing-extras/RajcePublishing.c \
@@ -37,11 +69,11 @@ index 432edaa..8496146 100644
  	plugins/shotwell-publishing/shotwell-publishing.c \
  	plugins/shotwell-transitions/BlindsEffect.c \
  	plugins/shotwell-transitions/ChessEffect.c \
-@@ -1029,18 +1017,9 @@ plugin_LTLIBRARIES =  \
- 	plugins/shotwell-publishing-extras/shotwell-publishing-extras.la \
- 	plugins/shotwell-transitions/shotwell-transitions.la \
+@@ -1112,18 +1088,9 @@ plugin_LTLIBRARIES =  \
  	plugins/shotwell-data-imports/shotwell-data-imports.la
--dist_plugin_DATA = plugins/shotwell-publishing/facebook.png \
+ dist_plugin_DATA = 
+ dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
+-dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/facebook.png \
 -	plugins/shotwell-publishing/flickr.png \
 -	plugins/shotwell-publishing/picasa.png \
 -	plugins/shotwell-publishing/piwigo.png \
@@ -50,24 +82,14 @@ index 432edaa..8496146 100644
 -	plugins/shotwell-publishing/flickr_pin_entry_pane.ui \
 -	plugins/shotwell-publishing/flickr_publishing_options_pane.ui \
 -	plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
-+dist_plugin_DATA = plugins/shotwell-publishing/piwigo.png \
++dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/piwigo.png \
  	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
  	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
 -	plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
- 	plugins/shotwell-publishing-extras/gallery3.png \
- 	plugins/shotwell-publishing-extras/rajce.png \
- 	plugins/shotwell-publishing-extras/tumblr.png \
-@@ -1048,9 +1027,6 @@ dist_plugin_DATA = plugins/shotwell-publishing/facebook.png \
- 	plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \
- 	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \
- 	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
--	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
--	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
--	plugins/shotwell-publishing-extras/yandex_publish_model.ui \
+ 	plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \
+ 	$(am__append_4) \
  	plugins/shotwell-transitions/slideshow-plugin.png \
- 	plugins/shotwell-data-imports/f-spot-24.png
- dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
-@@ -1288,10 +1264,6 @@ thumbnailer_shotwell_video_thumbnailer_CFLAGS = $(THUMBNAILER_CFLAGS)
+@@ -1375,10 +1342,6 @@ thumbnailer_shotwell_video_thumbnailer_CFLAGS = $(THUMBNAILER_CFLAGS)
  thumbnailer_shotwell_video_thumbnailer_LDADD = $(THUMBNAILER_LIBS)
  plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
  	plugins/shotwell-publishing/shotwell-publishing.vala \
@@ -78,16 +100,16 @@ index 432edaa..8496146 100644
  	plugins/shotwell-publishing/PiwigoPublishing.vala \
  	plugins/shotwell-plugin-common.vapi
  
-@@ -1323,8 +1295,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
- 	plugins/shotwell-publishing-extras/GalleryConnector.vala \
- 	plugins/shotwell-publishing-extras/RajcePublishing.vala \
- 	plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \
--	plugins/shotwell-publishing-extras/TumblrPublishing.vala \
--	plugins/shotwell-publishing-extras/YandexPublishing.vala \
- 	plugins/shotwell-plugin-common.vapi
+@@ -1414,8 +1377,6 @@ plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \
+ @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/GalleryConnector.vala \
+ @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/RajcePublishing.vala \
+ @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \
+-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/TumblrPublishing.vala \
+-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/YandexPublishing.vala \
+ @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-plugin-common.vapi
  
- plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
-@@ -1663,12 +1633,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p
+ @HAVE_EXTRA_PLUGINS_TRUE@nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
+@@ -1758,12 +1719,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p
  plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo:  \
  	plugins/shotwell-publishing-extras/$(am__dirstamp) \
  	plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp)
@@ -97,10 +119,10 @@ index 432edaa..8496146 100644
 -plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo:  \
 -	plugins/shotwell-publishing-extras/$(am__dirstamp) \
 -	plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp)
- 
- plugins/shotwell-publishing-extras/shotwell-publishing-extras.la: $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_DEPENDENCIES) $(EXTRA_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_DEPENDENCIES) plugins/shotwell-publishing-extras/$(am__dirstamp)
- 	$(AM_V_CCLD)$(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK) -rpath $(plugindir) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LIBADD) $(LIBS)
-@@ -1681,18 +1645,6 @@ plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp):
+ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo:  \
+ 	plugins/shotwell-publishing-extras/$(am__dirstamp) \
+ 	plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp)
+@@ -1779,18 +1734,6 @@ plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp):
  plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo:  \
  	plugins/shotwell-publishing/$(am__dirstamp) \
  	plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp)
@@ -119,22 +141,23 @@ index 432edaa..8496146 100644
  plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo:  \
  	plugins/shotwell-publishing/$(am__dirstamp) \
  	plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp)
-@@ -2541,14 +2493,8 @@ distclean-compile:
+@@ -2646,15 +2589,9 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-resource.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-transitions/$(DEPDIR)/plugins_shotwell_transitions_shotwell_transitions_la-BlindsEffect.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-transitions/$(DEPDIR)/plugins_shotwell_transitions_shotwell_transitions_la-ChessEffect.Plo@am__quote@
-@@ -2915,20 +2861,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p
+@@ -3030,20 +2967,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo `test -f 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
  
@@ -152,10 +175,10 @@ index 432edaa..8496146 100644
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo `test -f 'plugins/shotwell-publishing-extras/YandexPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/YandexPublishing.c
 -
- plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo: plugins/shotwell-publishing/shotwell-publishing.c
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo `test -f 'plugins/shotwell-publishing/shotwell-publishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/shotwell-publishing.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Plo
-@@ -2936,34 +2868,6 @@ plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-s
+ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo: plugins/shotwell-publishing-extras/resource.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo `test -f 'plugins/shotwell-publishing-extras/resource.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/resource.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Plo
+@@ -3058,34 +2981,6 @@ plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-s
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo `test -f 'plugins/shotwell-publishing/shotwell-publishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/shotwell-publishing.c
  
@@ -190,7 +213,7 @@ index 432edaa..8496146 100644
  plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo: plugins/shotwell-publishing/PiwigoPublishing.c
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo `test -f 'plugins/shotwell-publishing/PiwigoPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PiwigoPublishing.c
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Plo
-@@ -6770,20 +6674,6 @@ $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(src
+@@ -6941,16 +6836,6 @@ $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(src
  	@if test -f $@; then :; else \
  	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
  	fi
@@ -204,14 +227,10 @@ index 432edaa..8496146 100644
 -	@if test -f $@; then :; else \
 -	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
 -	fi
--$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
--	$(AM_V_at)rm -f $@ && echo stamp > $@-t
--	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
--	$(AM_V_at)mv -f $@-t $@
- $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c: $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp
- 	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; fi
- 	@if test -f $@; then :; else \
-@@ -6863,34 +6753,14 @@ $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_s
+ $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
+ 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+ 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
+@@ -6960,34 +6845,14 @@ $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_s
  	@if test -f $@; then :; else \
  	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
  	fi
@@ -246,9 +265,9 @@ index 432edaa..8496146 100644
 -	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
 +	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
  	$(AM_V_at)mv -f $@-t $@
- $(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- 	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-@@ -7414,14 +7284,8 @@ maintainer-clean-generic:
+ $(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+ 	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
+@@ -7551,14 +7416,8 @@ maintainer-clean-generic:
  	-rm -f $(srcdir)/plugins/shotwell-data-imports/shotwell-data-imports.c
  	-rm -f $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c
  	-rm -f $(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -263,7 +282,7 @@ index 432edaa..8496146 100644
  	-rm -f $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c
  	-rm -f $(srcdir)/plugins/shotwell-transitions/BlindsEffect.c
  	-rm -f $(srcdir)/plugins/shotwell-transitions/ChessEffect.c
-@@ -7656,14 +7520,8 @@ maintainer-clean-generic:
+@@ -7793,14 +7652,8 @@ maintainer-clean-generic:
  	-rm -f plugins/shotwell-data-imports/shotwell-data-imports.c
  	-rm -f plugins/shotwell-publishing-extras/GalleryConnector.c
  	-rm -f plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -279,10 +298,10 @@ index 432edaa..8496146 100644
  	-rm -f plugins/shotwell-transitions/BlindsEffect.c
  	-rm -f plugins/shotwell-transitions/ChessEffect.c
 diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
-index fb3b733..1ed0718 100644
+index 16ba868..209994b 100644
 --- a/misc/org.yorba.shotwell.gschema.xml
 +++ b/misc/org.yorba.shotwell.gschema.xml
-@@ -321,107 +321,7 @@
+@@ -327,107 +327,7 @@
          <description>A numeric code representing the last service to which photos were published</description>
      </key>
      
@@ -390,7 +409,7 @@ index fb3b733..1ed0718 100644
  </schema>
  
  <schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-piwigo/">
-@@ -530,14 +430,6 @@
+@@ -536,14 +436,6 @@
      </key>
  </schema>
  
@@ -405,7 +424,7 @@ index fb3b733..1ed0718 100644
  <schema id="org.yorba.shotwell.dataimports" path="/org/yorba/shotwell/dataimports/">
      <key name="last-used-dataimports-service" type="s">
          <default>""</default>
-@@ -621,48 +513,12 @@
+@@ -627,48 +519,12 @@
  </schema>
  
  <schema id="org.yorba.shotwell.plugins.enable-state" path="/org/yorba/shotwell/plugins/enable-state/" >
@@ -557,18 +576,17 @@ index 5f96f0a..637971d 100644
  src/UnityProgressBar.vala
  src/Upgrades.vala
 diff --git a/publish-extra.am b/publish-extra.am
-index 6c713bf..7c0026e 100644
+index 7448bf6..7bd68c7 100644
 --- a/publish-extra.am
 +++ b/publish-extra.am
-@@ -6,17 +6,12 @@ dist_plugin_DATA += \
- 	plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui \
+@@ -8,17 +8,12 @@ dist_noinst_DATA += \
  	plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \
  	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \
--	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
+ 	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
 -	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
 -	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
--	plugins/shotwell-publishing-extras/yandex_publish_model.ui
-+	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
+-	plugins/shotwell-publishing-extras/yandex_publish_model.ui \
+ 	plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
  
  plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
  	plugins/shotwell-publishing-extras/GalleryConnector.vala \
@@ -578,15 +596,15 @@ index 6c713bf..7c0026e 100644
 -	plugins/shotwell-publishing-extras/YandexPublishing.vala \
  	plugins/shotwell-plugin-common.vapi
  
- plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
+ nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
 diff --git a/publish.am b/publish.am
-index 93ec0cb..8e7d9ae 100644
+index 194dcb6..7dab0a6 100644
 --- a/publish.am
 +++ b/publish.am
-@@ -1,25 +1,12 @@
+@@ -1,26 +1,13 @@
  plugin_LTLIBRARIES += plugins/shotwell-publishing/shotwell-publishing.la
  
- dist_plugin_DATA += \
+ dist_noinst_DATA += \
 -	plugins/shotwell-publishing/facebook.png \
 -	plugins/shotwell-publishing/flickr.png \
 -	plugins/shotwell-publishing/picasa.png \
@@ -597,9 +615,9 @@ index 93ec0cb..8e7d9ae 100644
 -	plugins/shotwell-publishing/flickr_publishing_options_pane.ui \
 -	plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
  	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
--	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
--	plugins/shotwell-publishing/youtube_publishing_options_pane.ui
-+	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
+ 	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
+-	plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
+ 	plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
  
  plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
  	plugins/shotwell-publishing/shotwell-publishing.vala \
@@ -611,7 +629,7 @@ index 93ec0cb..8e7d9ae 100644
  	plugins/shotwell-plugin-common.vapi
  
 diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala
-index 2bbb8d8..c9556aa 100644
+index 7a8ac40..22b75ae 100644
 --- a/src/plugins/PublishingInterfaces.vala
 +++ b/src/plugins/PublishingInterfaces.vala
 @@ -8,8 +8,7 @@