From 92df0dc53dab816fe091aa184d6002a546b396c7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 6 Aug 2016 11:42:52 -0300 Subject: shotwell-1:0.23.4-1.nonprism1: updating version --- nonprism/shotwell/PKGBUILD | 10 +- nonprism/shotwell/nonprism.patch | 572 ++++++++++++++++++++++++++------------- 2 files changed, 389 insertions(+), 193 deletions(-) (limited to 'nonprism') diff --git a/nonprism/shotwell/PKGBUILD b/nonprism/shotwell/PKGBUILD index 5d1e1dd91..0954ea9ab 100644 --- a/nonprism/shotwell/PKGBUILD +++ b/nonprism/shotwell/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182905 2016-07-14 16:04:18Z spupykin $ +# $Id: PKGBUILD 183722 2016-07-22 14:52:08Z spupykin $ # Maintainer (Arch): Sergej Pupykin # Maintainer (Arch): Ionut Biru # Contributor (Arch): Joeny Ang @@ -7,7 +7,7 @@ pkgname=shotwell epoch=1 -pkgver=0.23.2 +pkgver=0.23.4 _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" @@ -19,11 +19,11 @@ conflicts=(${pkgname}-nonprism) depends=('libgee' 'webkit2gtk' 'libgexiv2' 'libraw' 'rest' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' 'gst-plugins-base' 'libgphoto2' 'libgudev') -makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils') +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=('dd679db40461a7245dc635042e40a31b' - 'a4dfa3d92faf72e726ff95638b15237e') +md5sums=('3f32c21bb3e7a2154be9585201fb7c4a' + '1466063535ce333efbf8d9c3407f5da5') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/nonprism/shotwell/nonprism.patch b/nonprism/shotwell/nonprism.patch index d7dd4676c..e12c001f4 100644 --- a/nonprism/shotwell/nonprism.patch +++ b/nonprism/shotwell/nonprism.patch @@ -1,30 +1,285 @@ -diff --git a/Makefile b/Makefile -index fbd3ebb..a21067c 100644 ---- a/Makefile -+++ b/Makefile -@@ -291,7 +291,7 @@ DESKTOP_APP_SHORT_NAME="Shotwell" - DESKTOP_APP_FULL_NAME="Shotwell Photo Manager" - DESKTOP_APPLICATION_COMMENT="Organize your photos" - DESKTOP_APPLICATION_CLASS="Photo Manager" --DESKTOP_APP_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;" -+DESKTOP_APP_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;piwigo;" - DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Shotwell" - DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer" - DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer" -diff --git a/help/Makefile.am b/help/Makefile.am -index 3ed819f..c5c2d22 100644 ---- a/help/Makefile.am -+++ b/help/Makefile.am -@@ -45,7 +45,6 @@ DOC_PAGES = \ - share-print.page \ - share-send.page \ - share-slideshow.page \ -- share-upload.page \ - view-displaying.page \ - view-information.page \ - view-sidebar.page +diff --git a/Makefile.in b/Makefile.in +index 432edaa..8496146 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) + 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 = \ + $(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 \ +- plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo \ +- 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 \ + plugins/shotwell-data-imports/shotwell-data-imports.c \ + plugins/shotwell-publishing-extras/GalleryConnector.c \ + plugins/shotwell-publishing-extras/RajcePublishing.c \ +- plugins/shotwell-publishing-extras/TumblrPublishing.c \ +- plugins/shotwell-publishing-extras/YandexPublishing.c \ + plugins/shotwell-publishing-extras/shotwell-publishing-extras.c \ +- plugins/shotwell-publishing/FacebookPublishing.c \ +- plugins/shotwell-publishing/FlickrPublishing.c \ +- plugins/shotwell-publishing/PicasaPublishing.c \ + plugins/shotwell-publishing/PiwigoPublishing.c \ +- plugins/shotwell-publishing/YouTubePublishing.c \ + 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 \ + plugins/shotwell-data-imports/shotwell-data-imports.la +-dist_plugin_DATA = 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 \ ++dist_plugin_DATA = 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-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) + thumbnailer_shotwell_video_thumbnailer_LDADD = $(THUMBNAILER_LIBS) + plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \ + 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 + +@@ -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 + + plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \ +@@ -1663,12 +1633,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) +-plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo: \ +- plugins/shotwell-publishing-extras/$(am__dirstamp) \ +- plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) +-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/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo: \ + plugins/shotwell-publishing/$(am__dirstamp) \ + plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo: \ +- plugins/shotwell-publishing/$(am__dirstamp) \ +- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo: \ +- plugins/shotwell-publishing/$(am__dirstamp) \ +- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo: \ +- plugins/shotwell-publishing/$(am__dirstamp) \ +- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo: \ +- plugins/shotwell-publishing/$(am__dirstamp) \ +- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) + 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: + @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-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-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 + @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 + +-plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo: plugins/shotwell-publishing-extras/TumblrPublishing.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-TumblrPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing-extras/TumblrPublishing.c' object='plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo' libtool=yes @AMDEPBACKSLASH@ +-@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-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c +- +-plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo: plugins/shotwell-publishing-extras/YandexPublishing.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-YandexPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo -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 +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing-extras/YandexPublishing.c' object='plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo' libtool=yes @AMDEPBACKSLASH@ +-@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 + @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 + +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo: plugins/shotwell-publishing/FacebookPublishing.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-FacebookPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo `test -f 'plugins/shotwell-publishing/FacebookPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FacebookPublishing.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/FacebookPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo' libtool=yes @AMDEPBACKSLASH@ +-@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-FacebookPublishing.lo `test -f 'plugins/shotwell-publishing/FacebookPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FacebookPublishing.c +- +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo: plugins/shotwell-publishing/PicasaPublishing.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-PicasaPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo `test -f 'plugins/shotwell-publishing/PicasaPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PicasaPublishing.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/PicasaPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo' libtool=yes @AMDEPBACKSLASH@ +-@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-PicasaPublishing.lo `test -f 'plugins/shotwell-publishing/PicasaPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PicasaPublishing.c +- +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo: plugins/shotwell-publishing/FlickrPublishing.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-FlickrPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo `test -f 'plugins/shotwell-publishing/FlickrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FlickrPublishing.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/FlickrPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo' libtool=yes @AMDEPBACKSLASH@ +-@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-FlickrPublishing.lo `test -f 'plugins/shotwell-publishing/FlickrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FlickrPublishing.c +- +-plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo: plugins/shotwell-publishing/YouTubePublishing.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-YouTubePublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo `test -f 'plugins/shotwell-publishing/YouTubePublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/YouTubePublishing.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/YouTubePublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo' libtool=yes @AMDEPBACKSLASH@ +-@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-YouTubePublishing.lo `test -f 'plugins/shotwell-publishing/YouTubePublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/YouTubePublishing.c +- + 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 + @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/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp +- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi +- @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/YandexPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp +- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi +- @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 + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +-$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp +- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +- @if test -f $@; then :; else \ +- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ +- fi +-$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp +- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +- @if test -f $@; then :; else \ +- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ +- fi +-$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp +- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +- @if test -f $@; then :; else \ +- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ +- fi +-$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp +- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi +- @if test -f $@; then :; else \ +- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ +- fi + $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +-$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: 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 ++$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t +- $(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: + -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 +- -rm -f $(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c +- -rm -f $(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c + -rm -f $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +- -rm -f $(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c +- -rm -f $(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c +- -rm -f $(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c + -rm -f $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c +- -rm -f $(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c + -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: + -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 +- -rm -f plugins/shotwell-publishing-extras/TumblrPublishing.c +- -rm -f plugins/shotwell-publishing-extras/YandexPublishing.c + -rm -f plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +- -rm -f plugins/shotwell-publishing/FacebookPublishing.c +- -rm -f plugins/shotwell-publishing/FlickrPublishing.c +- -rm -f plugins/shotwell-publishing/PicasaPublishing.c + -rm -f plugins/shotwell-publishing/PiwigoPublishing.c +- -rm -f plugins/shotwell-publishing/YouTubePublishing.c + -rm -f plugins/shotwell-publishing/shotwell-publishing.c + -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 1f6a093..f94ee0a 100644 +index fb3b733..1ed0718 100644 --- a/misc/org.yorba.shotwell.gschema.xml +++ b/misc/org.yorba.shotwell.gschema.xml @@ -321,107 +321,7 @@ @@ -199,11 +454,11 @@ index 1f6a093..f94ee0a 100644 false enable rajce publishing plugin -diff --git a/misc/shotwell.appdata.xml b/misc/shotwell.appdata.xml -index 62b9a57..89c08ad 100644 ---- a/misc/shotwell.appdata.xml -+++ b/misc/shotwell.appdata.xml -@@ -14,10 +14,6 @@ +diff --git a/misc/shotwell.appdata.xml.in b/misc/shotwell.appdata.xml.in +index 955ec1c..4371892 100644 +--- a/misc/shotwell.appdata.xml.in ++++ b/misc/shotwell.appdata.xml.in +@@ -16,10 +16,6 @@ your master photos, making it easy to experiment and correct errors.

@@ -214,148 +469,19 @@ index 62b9a57..89c08ad 100644 Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.

-diff --git a/misc/shotwell.convert b/misc/shotwell.convert -index 2f972c1..c8d4ee2 100644 ---- a/misc/shotwell.convert -+++ b/misc/shotwell.convert -@@ -65,29 +65,11 @@ default-service = /apps/shotwell/sharing/default_service - last-used-service = /apps/shotwell/sharing/last_used_service - - [org.yorba.shotwell.plugins.enable-state] --publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled --publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled --publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled - publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled --publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled --publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled - transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled - transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled - transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled - --[org.yorba.shotwell.sharing.facebook] --uid = /apps/shotwell/sharing/facebook/uid --user-name = /apps/shotwell/sharing/facebook/user_name --default-size = /apps/shotwell/sharing/facebook/default_size -- --[org.yorba.shotwell.sharing.flickr] --default-size = /apps/shotwell/sharing/flickr/default_size --visibility = /apps/shotwell/sharing/flickr/visibility -- --[org.yorba.shotwell.sharing.picasa] --default-size = /apps/shotwell/sharing/picasa/default_size --last-album = /apps/shotwell/sharing/picasa/last_album -- - [org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo] - url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url - username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username -@@ -95,11 +77,3 @@ password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/password - remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password - last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category - last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level -- --[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki] --auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token -- --[org.yorba.shotwell.sharing.youtube] --user-name = /apps/shotwell/sharing/youtube/user_name --auth-token = /apps/shotwell/sharing/youtube/auth_token -- -diff --git a/misc/shotwell.desktop.head b/misc/shotwell.desktop.head -index 09ca9ed..b85f3c6 100644 ---- a/misc/shotwell.desktop.head -+++ b/misc/shotwell.desktop.head -@@ -3,7 +3,7 @@ Version=1.0 - Name=Shotwell +diff --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in.in +index aa1ede2..ea52381 100644 +--- a/misc/shotwell.desktop.in.in ++++ b/misc/shotwell.desktop.in.in +@@ -4,7 +4,7 @@ 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; +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;piwigo; Exec=shotwell %U + # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=shotwell - Terminal=false -diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala -index d9bf2ce..9d47cf8 100644 ---- a/plugins/common/RESTSupport.vala -+++ b/plugins/common/RESTSupport.vala -@@ -652,10 +652,6 @@ public abstract class BatchUploader { - return session; - } - -- protected Spit.Publishing.Publishable get_current_publishable() { -- return publishables[current_file]; -- } -- - protected abstract Transaction create_transaction(Spit.Publishing.Publishable publishable); - - public void upload(Spit.Publishing.ProgressCallback? status_updated = null) { -diff --git a/plugins/plugins.mk b/plugins/plugins.mk -index 687ceeb..ab82aed 100644 ---- a/plugins/plugins.mk -+++ b/plugins/plugins.mk -@@ -6,32 +6,16 @@ PLUGINS := \ - shotwell-data-imports - - PLUGINS_RC := \ -- plugins/shotwell-publishing/facebook.png \ -- plugins/shotwell-publishing/facebook_publishing_options_pane.glade \ -- plugins/shotwell-publishing/flickr.png \ -- plugins/shotwell-publishing/flickr_publishing_options_pane.glade \ -- plugins/shotwell-publishing/flickr_pin_entry_pane.glade \ -- plugins/shotwell-publishing/picasa.png \ -- plugins/shotwell-publishing/picasa_publishing_options_pane.glade \ -- plugins/shotwell-publishing/youtube.png \ -- plugins/shotwell-publishing/youtube_publishing_options_pane.glade \ - plugins/shotwell-publishing/piwigo.png \ - plugins/shotwell-publishing/piwigo_authentication_pane.glade \ - plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \ - plugins/shotwell-transitions/slideshow-plugin.png - --EXTRA_PLUGINS := \ -- shotwell-publishing-extras -- - EXTRA_PLUGINS_RC := \ -- plugins/shotwell-publishing-extras/yandex_publish_model.glade \ - plugins/shotwell-data-imports/f-spot-24.png \ - plugins/shotwell-publishing-extras/gallery3.png \ - plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade \ - plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade \ -- plugins/shotwell-publishing-extras/tumblr.png \ -- plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \ -- plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade \ - plugins/shotwell-publishing-extras/rajce.png \ - plugins/shotwell-publishing-extras/rajce_authentication_pane.glade \ - plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade -diff --git a/plugins/shotwell-publishing/Makefile b/plugins/shotwell-publishing/Makefile -index 607bc6b..40071ba 100644 ---- a/plugins/shotwell-publishing/Makefile -+++ b/plugins/shotwell-publishing/Makefile -@@ -13,25 +13,12 @@ PLUGIN_PKGS := \ - - SRC_FILES := \ - shotwell-publishing.vala \ -- FacebookPublishing.vala \ -- PicasaPublishing.vala \ -- FlickrPublishing.vala \ -- YouTubePublishing.vala \ - PiwigoPublishing.vala - - RC_FILES := \ -- facebook.png \ -- facebook_publishing_options_pane.glade \ -- flickr.png \ -- flickr_publishing_options_pane.glade \ -- flickr_pin_entry_pane.glade \ -- picasa.png \ -- picasa_publishing_options_pane.glade \ - piwigo.png \ - piwigo_authentication_pane.glade \ -- piwigo_publishing_options_pane.glade \ -- youtube.png \ -- youtube_publishing_options_pane.glade -+ piwigo_publishing_options_pane.glade - - include ../Makefile.plugin.mk - diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala index bbd5ddb..342f2f3 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.vala @@ -380,42 +506,112 @@ index bbd5ddb..342f2f3 100644 pluggables += new PiwigoService(resource_directory); } +diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala +index 9e70d30..560d193 100644 +--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala ++++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala +@@ -10,8 +10,6 @@ private class ShotwellPublishingExtraServices : Object, Spit.Module { + private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; + + public ShotwellPublishingExtraServices(GLib.File module_file) { +- pluggables += new YandexService(); +- pluggables += new TumblrService(module_file.get_parent()); + pluggables += new RajceService(module_file.get_parent()); + pluggables += new Gallery3Service(module_file.get_parent()); + } diff --git a/po/POTFILES.in b/po/POTFILES.in -index d83fed1..9c9bd89 100644 +index 5f96f0a..637971d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in -@@ -17,29 +17,15 @@ plugins/shotwell-data-imports/SqliteSupport.vala - plugins/shotwell-data-imports/VersionNumber.vala - plugins/shotwell-publishing-extras/GalleryConnector.vala +@@ -28,24 +28,10 @@ plugins/shotwell-publishing-extras/rajce_authentication_pane.ui + plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui plugins/shotwell-publishing-extras/RajcePublishing.vala + plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala +-plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui +-plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui -plugins/shotwell-publishing-extras/TumblrPublishing.vala -plugins/shotwell-publishing-extras/YandexPublishing.vala - plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala - [type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade - [type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade --[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade --[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade - [type: gettext/glade]plugins/shotwell-publishing-extras/rajce_authentication_pane.glade - [type: gettext/glade]plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade --[type: gettext/glade]plugins/shotwell-publishing-extras/yandex_publish_model.glade +-plugins/shotwell-publishing-extras/yandex_publish_model.ui +-plugins/shotwell-publishing/facebook_publishing_options_pane.ui -plugins/shotwell-publishing/FacebookPublishing.vala +-plugins/shotwell-publishing/flickr_pin_entry_pane.ui +-plugins/shotwell-publishing/flickr_publishing_options_pane.ui -plugins/shotwell-publishing/FlickrPublishing.vala +-plugins/shotwell-publishing/picasa_publishing_options_pane.ui -plugins/shotwell-publishing/PicasaPublishing.vala + plugins/shotwell-publishing/piwigo_authentication_pane.ui + plugins/shotwell-publishing/piwigo_publishing_options_pane.ui plugins/shotwell-publishing/PiwigoPublishing.vala --plugins/shotwell-publishing/YouTubePublishing.vala --[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade --[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade --[type: gettext/glade]plugins/shotwell-publishing/flickr_publishing_options_pane.glade --[type: gettext/glade]plugins/shotwell-publishing/picasa_publishing_options_pane.glade - [type: gettext/glade]plugins/shotwell-publishing/piwigo_authentication_pane.glade - [type: gettext/glade]plugins/shotwell-publishing/piwigo_publishing_options_pane.glade plugins/shotwell-publishing/shotwell-publishing.vala --[type: gettext/glade]plugins/shotwell-publishing/youtube_publishing_options_pane.glade +-plugins/shotwell-publishing/youtube_publishing_options_pane.ui +-plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala +@@ -215,7 +201,6 @@ src/ThumbnailCache.vala + src/Thumbnail.vala + src/TimedQueue.vala + src/Tombstone.vala +-src/unit/rc/template.vala + src/unit/Unit.vala + src/UnityProgressBar.vala + src/Upgrades.vala +diff --git a/publish-extra.am b/publish-extra.am +index 6c713bf..7c0026e 100644 +--- a/publish-extra.am ++++ b/publish-extra.am +@@ -6,17 +6,12 @@ dist_plugin_DATA += \ + plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui \ + 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/rajce_publishing_options_pane.ui + + 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 + + plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \ +diff --git a/publish.am b/publish.am +index 93ec0cb..8e7d9ae 100644 +--- a/publish.am ++++ b/publish.am +@@ -1,25 +1,12 @@ + plugin_LTLIBRARIES += plugins/shotwell-publishing/shotwell-publishing.la + + dist_plugin_DATA += \ +- 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 \ + 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_shotwell_publishing_la_SOURCES = \ + 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 + diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala -index 6f06cba..8936cc9 100644 +index 2bbb8d8..c9556aa 100644 --- a/src/plugins/PublishingInterfaces.vala +++ b/src/plugins/PublishingInterfaces.vala @@ -8,8 +8,7 @@ -- cgit v1.2.3-54-g00ecf