diffstat of debian/ for shotwell_0.28.4-1 shotwell_0.30.2-0ubuntu2 debian/changelog | 74 debian/control | 17 debian/dirs | 6 debian/docs | 3 debian/gbp.conf | 5 debian/menu | 2 debian/patches/0001-buildflags.patch | 20 debian/patches/0005-hardening.patch | 38 debian/patches/0010-libexec.patch | 16 debian/patches/0105-gitversion.patch | 19 debian/patches/0500-Port-to-webkit2gtk-40.patch | 1026 ---------- debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch | 44 debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch | 39 debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch | 25 debian/patches/0510-Delay_size_request.patch | 26 debian/patches/0515-Fix_background_color_drawing.patch | 32 debian/patches/0600-remove_wrong_marco.patch | 19 debian/patches/505-fix-viewer-desktop-file.patch | 27 debian/patches/git_glib_bindingflags.patch | 21 debian/patches/series | 16 debian/replace_thumbnailer.sh | 21 debian/rules | 19 debian/shotwell-common.README.Debian | 25 debian/shotwell-common.postrm | 18 debian/shotwell.README.Debian | 25 debian/shotwell.docs | 2 debian/shotwell.examples | 1 debian/shotwell.install | 1 debian/shotwell.postrm | 15 dist/debian/changelog | 997 +++++++++ dist/debian/compat | 1 dist/debian/control | 67 dist/debian/copyright | 26 dist/debian/dirs | 6 dist/debian/docs | 3 dist/debian/menu | 2 dist/debian/rules | 16 dist/debian/shotwell.install | 3 dist/debian/watch | 3 39 files changed, 1257 insertions(+), 1469 deletions(-) diff -Nru shotwell-0.28.4/debian/changelog shotwell-0.30.2/debian/changelog --- shotwell-0.28.4/debian/changelog 2018-08-04 12:40:03.000000000 +0000 +++ shotwell-0.30.2/debian/changelog 2019-04-09 14:11:48.000000000 +0000 @@ -1,3 +1,77 @@ +shotwell (0.30.2-0ubuntu2) disco; urgency=medium + + * debian/patches/git_glib_bindingflags.patch + - Fix references to GLib.BindingFlags (LP: #1823437) + + -- Ken VanDine Tue, 09 Apr 2019 10:11:48 -0400 + +shotwell (0.30.2-0ubuntu1) disco; urgency=medium + + * New upstream version + - Fix issues with google and flickr not being able to log in + (lp: #1620336) + * debian/patches/git_notification_segfault.patch: + - removed, that change is in the new version + + -- Sebastien Bacher Wed, 20 Feb 2019 17:25:41 +0100 + +shotwell (0.30.1-0ubuntu5) disco; urgency=medium + + * No-change rebuild against latest libraw + + -- Jeremy Bicha Fri, 09 Nov 2018 16:37:50 -0500 + +shotwell (0.30.1-0ubuntu4) disco; urgency=medium + + * debian/patches/git_notification_segfault.patch: + - direct: Fix crash when dismissing modifications (lp: #1723181) + + -- Sebastien Bacher Wed, 07 Nov 2018 15:39:16 +0100 + +shotwell (0.30.1-0ubuntu2) cosmic; urgency=medium + + * No change rebuild for launchpad import + + -- Sebastien Bacher Tue, 09 Oct 2018 11:26:09 +0200 + +shotwell (0.30.1-0ubuntu1) cosmic; urgency=medium + + * New bugfixes version + + -- Sebastien Bacher Wed, 03 Oct 2018 17:19:08 +0200 + +shotwell (0.30.0-0ubuntu1) cosmic; urgency=medium + + * New upstream version + + -- Sebastien Bacher Mon, 17 Sep 2018 11:35:07 +0200 + +shotwell (0.29.91-0ubuntu1) cosmic; urgency=medium + + * New upstream version (lp: #1787022): + - Fix Slideshow settings dialog (lp: #1772878) + * debian/control: updated gtk requirement + * debian/patches/0105-gitversion.patch: + - remove buggy debian change, the define is correct + * debian/shotwell.docs: + - updated for the new version + + -- Sebastien Bacher Thu, 23 Aug 2018 11:03:07 +0200 + +shotwell (0.28.4-1ubuntu1) cosmic; urgency=medium + + * Sync with Debian. Remaining changes: + - Don't clutter up debian/ with old, disabled patches + - Clean up rules + - Install Appstream metadata + - Build with meson + - Build with gnome-pkg-tools + - Build with Unity support + - clean out thumbnailer hacks: + that's not user friendly and not something we should recommend + + -- Jeremy Bicha Tue, 14 Aug 2018 15:52:14 -0400 + shotwell (0.28.4-1) unstable; urgency=medium * New upstream release. diff -Nru shotwell-0.28.4/debian/control shotwell-0.30.2/debian/control --- shotwell-0.28.4/debian/control 2018-07-09 10:15:56.000000000 +0000 +++ shotwell-0.30.2/debian/control 2019-02-20 16:25:19.000000000 +0000 @@ -1,12 +1,13 @@ Source: shotwell Section: gnome Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jörg Frings-Fürst Build-Depends: appstream-util, - debhelper (>= 11), + debhelper (>= 11.1.3), desktop-file-utils, - gnome-doc-utils, + gnome-pkg-tools, itstool, libappstream-glib-dev, libexif-dev (>= 0.6.16), @@ -18,7 +19,7 @@ libgphoto2-dev (>= 2.5.4), libgstreamer-plugins-base1.0-dev (>= 1.0.0), libgstreamer1.0-dev (>= 1.0.0), - libgtk-3-dev (>= 3.14), + libgtk-3-dev (>= 3.22), libgudev-1.0-dev (>= 145), libicu-dev, libjson-glib-dev, @@ -26,13 +27,17 @@ librest-dev (>= 0.7), libsoup2.4-dev (>= 2.26.0), libsqlite3-dev (>= 3.5.9), + libunity-dev, libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), + meson, valac (>= 0.22.0) Standards-Version: 4.1.5 Homepage: https://wiki.gnome.org/Apps/Shotwell -Vcs-Git: git://jff.email/opt/git/shotwell.git -Vcs-Browser: https://jff.email/cgit/shotwell.git +Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/shotwell/+git/shotwell +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/shotwell +XS-Debian-Vcs-Git: git://jff.email/opt/git/shotwell.git +XS-Debian-Vcs-Browser: https://jff.email/cgit/shotwell.git Package: shotwell Architecture: linux-any diff -Nru shotwell-0.28.4/debian/dirs shotwell-0.30.2/debian/dirs --- shotwell-0.28.4/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/debian/dirs 2019-02-20 16:25:19.000000000 +0000 @@ -0,0 +1,6 @@ +/usr +/usr/bin +/usr/lib/shotwell/plugins/builtin +/usr/share/applications +/usr/share/locale-langpack +/usr/share/gnome/help/shotwell diff -Nru shotwell-0.28.4/debian/docs shotwell-0.30.2/debian/docs --- shotwell-0.28.4/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/debian/docs 2019-02-20 16:25:19.000000000 +0000 @@ -0,0 +1,3 @@ +NEWS +README +THANKS diff -Nru shotwell-0.28.4/debian/gbp.conf shotwell-0.30.2/debian/gbp.conf --- shotwell-0.28.4/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/debian/gbp.conf 2019-02-20 16:25:19.000000000 +0000 @@ -0,0 +1,5 @@ +[DEFAULT] +pristine-tar = True +debian-branch = ubuntu/master +debian-tag = ubuntu/%(version)s +upstream-branch = upstream diff -Nru shotwell-0.28.4/debian/menu shotwell-0.30.2/debian/menu --- shotwell-0.28.4/debian/menu 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/debian/menu 2019-02-20 16:25:19.000000000 +0000 @@ -0,0 +1,2 @@ +?package(shotwell):needs="X11" section="Applications/Viewers"\ + title="Shotwell" command="/usr/bin/shotwell" diff -Nru shotwell-0.28.4/debian/patches/0001-buildflags.patch shotwell-0.30.2/debian/patches/0001-buildflags.patch --- shotwell-0.28.4/debian/patches/0001-buildflags.patch 2016-06-26 06:41:28.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0001-buildflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Description: Poke requested Debian buildflags for hardening into Makefile -Author: Jörg Frings-Fürst -Last-Update: 2015-01-07 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -385,8 +385,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe - endif - endif - --CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) --PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) -+CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) -fstack-protector-strong -+PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) -fPIC -fno-stack-protector - - # Required for gudev-1.0 - CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE diff -Nru shotwell-0.28.4/debian/patches/0005-hardening.patch shotwell-0.30.2/debian/patches/0005-hardening.patch --- shotwell-0.28.4/debian/patches/0005-hardening.patch 2016-06-26 06:41:39.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0005-hardening.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -Description: pass compiler flags set in debian/rules to compiler -Author: Devid Antonio Filoni - -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -35,7 +35,7 @@ CORE_SUPPORTED_LANGUAGES=$(shell cat po/ - LOCAL_LANG_DIR=locale-langpack - SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale - --VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS) -+VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --enable-experimental --enable-deprecated $(USER_VALAFLAGS) - ifdef UNITY_SUPPORT - VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT - endif -@@ -661,7 +661,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) - @ - - $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile -- $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $< -+ $(CC) -c $(VALA_CFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ $< - - $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled $(DOC_LANG_STAMP) - $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@ -Index: trunk/plugins/Makefile.plugin.mk -=================================================================== ---- trunk.orig/plugins/Makefile.plugin.mk -+++ trunk/plugins/Makefile.plugin.mk -@@ -42,7 +42,7 @@ PLUGIN_EXTRAFLAGS ?= --vapidir=../common - PLUGIN_EXTRALINKFLAGS ?= -L../common/ -lshotwell-plugin-common - - .stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES) -- $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --ccode --enable-deprecated \ -+ $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --ccode --enable-deprecated \ - --vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) $(foreach pkg,$(CUSTOM_VAPI_PKGS),--pkg=$(pkg)) \ - $(USER_VALAFLAGS) \ - $(PLUGIN_EXTRAFLAGS) \ diff -Nru shotwell-0.28.4/debian/patches/0010-libexec.patch shotwell-0.30.2/debian/patches/0010-libexec.patch --- shotwell-0.28.4/debian/patches/0010-libexec.patch 2014-02-16 13:18:44.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0010-libexec.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: do not install files in libexec directory -Author: Luca Falavigna - -Index: shotwell-0.15.0/Makefile -=================================================================== ---- shotwell-0.15.0.orig/Makefile 2013-10-13 09:51:58.893357001 +0200 -+++ shotwell-0.15.0/Makefile 2013-10-13 09:54:33.885361749 +0200 -@@ -27,7 +27,7 @@ - - -include configure.mk - ifndef LIBEXECDIR --LIBEXECDIR=$(PREFIX)/libexec/shotwell -+LIBEXECDIR=$(PREFIX)/share/shotwell - endif - - CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS) diff -Nru shotwell-0.28.4/debian/patches/0105-gitversion.patch shotwell-0.30.2/debian/patches/0105-gitversion.patch --- shotwell-0.28.4/debian/patches/0105-gitversion.patch 2018-07-09 10:10:39.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0105-gitversion.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Typo in git version macro -Author: Jörg Fringy-Fürst -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=795719 -Last-Update: 2018-05-01 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/Resources.vala -=================================================================== ---- trunk.orig/src/Resources.vala -+++ trunk/src/Resources.vala -@@ -18,7 +18,7 @@ namespace Resources { - public const string APP_DIRECT_ROLE = _("Photo Viewer"); - public const string APP_VERSION = _VERSION; - --#if _GITVERSION -+#if _GIT_VERSION - public const string? GIT_VERSION = _GIT_VERSION; - #else - public const string? GIT_VERSION = null; diff -Nru shotwell-0.28.4/debian/patches/0500-Port-to-webkit2gtk-40.patch shotwell-0.30.2/debian/patches/0500-Port-to-webkit2gtk-40.patch --- shotwell-0.28.4/debian/patches/0500-Port-to-webkit2gtk-40.patch 2015-12-13 07:57:45.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0500-Port-to-webkit2gtk-40.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1026 +0,0 @@ -From afc5e103d2dd414f0d028565097d86c7e85fadbc Mon Sep 17 00:00:00 2001 -From: Iain Lane -Date: Tue, 30 Jun 2015 10:43:15 +0100 -Subject: [PATCH] Port to webkit2gtk-4.0 - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - Makefile | 8 +- - debian/control | 2 +- - plugins/common/RESTSupport.vala | 24 +- - plugins/shotwell-publishing-extras/Makefile | 2 +- - .../YandexPublishing.vala | 67 ++- - .../shotwell-publishing/FacebookPublishing.vala | 36 +- - plugins/shotwell-publishing/Makefile | 2 +- - vapi/webkitgtk-3.0.deps | 8 - - vapi/webkitgtk-3.0.vapi | 653 --------------------- - 9 files changed, 97 insertions(+), 705 deletions(-) - delete mode 100644 vapi/webkitgtk-3.0.deps - delete mode 100644 vapi/webkitgtk-3.0.vapi - -diff --git a/Makefile b/Makefile -index fe354a7..1ce5668 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,7 +14,7 @@ VALAC := $(shell which $(VALAC)) - endif - - VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'` --MIN_VALAC_VERSION := 0.20.1 -+MIN_VALAC_VERSION := 0.28.0 - INSTALL_PROGRAM := install - INSTALL_DATA := install -m 644 - -@@ -120,12 +120,10 @@ VAPI_FILES = \ - LConv.vapi \ - libexif.vapi \ - libraw.vapi \ -- webkitgtk-3.0.vapi \ - unique-3.0.vapi \ - unity.vapi - - DEPS_FILES = \ -- webkitgtk-3.0.deps \ - unique-3.0.deps \ - unity.deps - -@@ -271,7 +269,7 @@ EXT_PKGS = \ - libsoup-2.4 \ - libxml-2.0 \ - sqlite3 \ -- webkitgtk-3.0 -+ webkit2gtk-4.0 - ifdef UNITY_SUPPORT - EXT_PKGS += unity - endif -@@ -303,7 +301,7 @@ EXT_PKG_VERSIONS = \ - libxml-2.0 >= 2.6.32 \ - rest-0.7 >= 0.7 \ - sqlite3 >= 3.5.9 \ -- webkitgtk-3.0 >= 1.4.0 \ -+ webkit2gtk-4.0 \ - gnome-doc-utils - - DIRECT_LIBS_VERSIONS = -diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala -index fdde409..a4a0621 100644 ---- a/plugins/common/RESTSupport.vala -+++ b/plugins/common/RESTSupport.vala -@@ -741,10 +741,9 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - - webview = new WebKit.WebView(); - webview.get_settings().enable_plugins = false; -- webview.get_settings().enable_default_context_menu = false; - -- webview.load_finished.connect(on_page_load); -- webview.load_started.connect(on_load_started); -+ webview.load_changed.connect(on_page_load_changed); -+ webview.context_menu.connect(() => { return false; }); - - webview_frame.add(webview); - pane_widget.pack_start(webview_frame, true, true, 0); -@@ -754,7 +753,7 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - return cache_dirty; - } - -- private void on_page_load(WebKit.WebFrame origin_frame) { -+ private void on_page_load() { - pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR)); - - string page_title = webview.get_title(); -@@ -772,9 +771,22 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - } - } - -- private void on_load_started(WebKit.WebFrame frame) { -+ private void on_load_started() { - pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH)); - } -+ -+ private void on_page_load_changed (WebKit.LoadEvent load_event) { -+ switch (load_event) { -+ case WebKit.LoadEvent.STARTED: -+ on_load_started(); -+ break; -+ case WebKit.LoadEvent.FINISHED: -+ on_page_load(); -+ break; -+ } -+ -+ return; -+ } - - public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() { - return Spit.Publishing.DialogPane.GeometryOptions.NONE; -@@ -785,7 +797,7 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - } - - public void on_pane_installed() { -- webview.open(auth_sequence_start_url); -+ webview.load_uri(auth_sequence_start_url); - } - - public void on_pane_uninstalled() { -diff --git a/plugins/shotwell-publishing-extras/Makefile b/plugins/shotwell-publishing-extras/Makefile -index 9259fbb..91452cf 100644 ---- a/plugins/shotwell-publishing-extras/Makefile -+++ b/plugins/shotwell-publishing-extras/Makefile -@@ -5,7 +5,7 @@ PLUGIN_PKGS := \ - gtk+-3.0 \ - libsoup-2.4 \ - libxml-2.0 \ -- webkitgtk-3.0 \ -+ webkit2gtk-4.0 \ - gee-0.8 \ - rest-0.7 \ - json-glib-1.0 -diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala -index 36a3ede..ec99c2b 100644 ---- a/plugins/shotwell-publishing-extras/YandexPublishing.vala -+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala -@@ -120,43 +120,70 @@ internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object { - - webview = new WebKit.WebView(); - webview.get_settings().enable_plugins = false; -- webview.get_settings().enable_default_context_menu = false; - -- webview.load_finished.connect(on_page_load); -- webview.load_started.connect(on_load_started); -- webview.navigation_requested.connect(navigation_requested); -+ webview.load_changed.connect(on_page_load_changed); -+ webview.decide_policy.connect(on_decide_policy); -+ webview.context_menu.connect(() => { return false; }); - - webview_frame.add(webview); - pane_widget.pack_start(webview_frame, true, true, 0); - } - -- private void on_page_load(WebKit.WebFrame origin_frame) { -+ private void on_page_load() { - pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR)); - } - -- private WebKit.NavigationResponse navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest req) { -- debug("Navigating to '%s'", req.uri); -+ private bool on_decide_policy (WebKit.PolicyDecision decision, -+ WebKit.PolicyDecisionType type) { -+ switch (type) { -+ case WebKit.PolicyDecisionType.NAVIGATION_ACTION: -+ WebKit.NavigationPolicyDecision n_decision = (WebKit.NavigationPolicyDecision) decision; -+ WebKit.NavigationAction action = n_decision.navigation_action; -+ string uri = action.get_request().uri; -+ debug("Navigating to '%s'", uri); - -- MatchInfo info = null; -+ MatchInfo info = null; - -- if (re.match(req.uri, 0, out info)) { -- string access_token = info.fetch_all()[2]; -+ if (re.match(uri, 0, out info)) { -+ string access_token = info.fetch_all()[2]; - -- debug("Load completed: %s", access_token); -- pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR)); -- if (access_token != null) { -- login_succeeded(access_token); -- return WebKit.NavigationResponse.IGNORE; -- } else -- login_failed(); -+ debug("Load completed: %s", access_token); -+ pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR)); -+ if (access_token != null) { -+ login_succeeded(access_token); -+ decision.ignore(); -+ break; -+ } else -+ login_failed(); -+ } -+ decision.use(); -+ break; -+ case WebKit.PolicyDecisionType.RESPONSE: -+ decision.use(); -+ break; -+ default: -+ return false; - } -- return WebKit.NavigationResponse.ACCEPT; -+ return true; - } - -- private void on_load_started(WebKit.WebFrame frame) { -+ private void on_load_started() { - pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH)); - } - -+ private void on_page_load_changed (WebKit.LoadEvent load_event) { -+ switch (load_event) { -+ case WebKit.LoadEvent.STARTED: -+ on_load_started(); -+ break; -+ case WebKit.LoadEvent.FINISHED: -+ on_page_load(); -+ break; -+ } -+ -+ return; -+ } -+ - public Gtk.Widget get_widget() { - return pane_widget; - } -@@ -166,7 +193,7 @@ internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object { - } - - public void on_pane_installed() { -- webview.open(login_url); -+ webview.load_uri(login_url); - } - - public void on_pane_uninstalled() { -diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala -index 1dd793d..4efe7f7 100644 ---- a/plugins/shotwell-publishing/FacebookPublishing.vala -+++ b/plugins/shotwell-publishing/FacebookPublishing.vala -@@ -535,7 +535,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { - return; - - debug("EVENT: endpoint test transaction failed to detect a connection to the Facebook " + -- "endpoint"); -+ "endpoint" + error.message); - - on_generic_error(error); - } -@@ -829,15 +829,15 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - - webview = new WebKit.WebView(); - webview.get_settings().enable_plugins = false; -- webview.get_settings().enable_default_context_menu = false; -+ webview.get_settings().enable_xss_auditor = false; - -- webview.load_finished.connect(on_page_load); -- webview.load_started.connect(on_load_started); -+ webview.load_changed.connect(on_page_load_changed); -+ webview.context_menu.connect(() => { return true; }); - - webview_frame.add(webview); - pane_widget.pack_start(webview_frame, true, true, 0); - } -- -+ - private class LocaleLookup { - public string prefix; - public string translation; -@@ -945,10 +945,11 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - return "https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https://www.facebook.com/connect/login_success.html&scope=publish_actions,user_photos,user_videos&response_type=token".printf(facebook_locale, APPLICATION_ID); - } - -- private void on_page_load(WebKit.WebFrame origin_frame) { -+ private void on_page_load() { - pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR)); - -- string loaded_url = origin_frame.get_uri().dup(); -+ string loaded_url = webview.uri.dup(); -+ debug("loaded url: " + loaded_url); - - // strip parameters from the loaded url - if (loaded_url.contains("?")) { -@@ -960,7 +961,7 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - // were we redirected to the facebook login success page? - if (loaded_url.contains("login_success")) { - cache_dirty = true; -- login_succeeded(origin_frame.get_uri()); -+ login_succeeded(webview.uri); - return; - } - -@@ -971,10 +972,24 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - } - } - -- private void on_load_started(WebKit.WebFrame frame) { -+ private void on_load_started() { - pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH)); - } - -+ private void on_page_load_changed (WebKit.LoadEvent load_event) { -+ switch (load_event) { -+ case WebKit.LoadEvent.STARTED: -+ case WebKit.LoadEvent.REDIRECTED: -+ on_load_started(); -+ break; -+ case WebKit.LoadEvent.FINISHED: -+ on_page_load(); -+ break; -+ } -+ -+ return; -+ } -+ - public static bool is_cache_dirty() { - return cache_dirty; - } -@@ -988,7 +1003,7 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - } - - public void on_pane_installed() { -- webview.open(get_login_url()); -+ webview.load_uri(get_login_url()); - } - - public void on_pane_uninstalled() { -@@ -1527,6 +1542,7 @@ internal class GraphSession { - "Service %s returned HTTP status code %u %s", real_message.get_uri(), - msg.status_code, msg.reason_phrase); - } else { -+ debug(msg.reason_phrase); - error = new Spit.Publishing.PublishingError.NO_ANSWER( - "Failure communicating with %s (error code %u)", real_message.get_uri(), - msg.status_code); -diff --git a/plugins/shotwell-publishing/Makefile b/plugins/shotwell-publishing/Makefile -index 639fa88..6b3945b 100644 ---- a/plugins/shotwell-publishing/Makefile -+++ b/plugins/shotwell-publishing/Makefile -@@ -5,7 +5,7 @@ PLUGIN_PKGS := \ - gtk+-3.0 \ - libsoup-2.4 \ - libxml-2.0 \ -- webkitgtk-3.0 \ -+ webkit2gtk-4.0 \ - gexiv2 \ - rest-0.7 \ - gee-0.8 \ -diff --git a/vapi/webkitgtk-3.0.deps b/vapi/webkitgtk-3.0.deps -deleted file mode 100644 -index 91b1dfe..0000000 ---- a/vapi/webkitgtk-3.0.deps -+++ /dev/null -@@ -1,8 +0,0 @@ --atk --gio-2.0 --cairo --pango --gdk-pixbuf-2.0 --gdk-3.0 --gtk+-3.0 --libsoup-2.4 -diff --git a/vapi/webkitgtk-3.0.vapi b/vapi/webkitgtk-3.0.vapi -deleted file mode 100644 -index 9e0d347..0000000 ---- a/vapi/webkitgtk-3.0.vapi -+++ /dev/null -@@ -1,653 +0,0 @@ --/* webkit-1.0.vapi generated by vapigen, do not modify. */ -- --[CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")] --namespace WebKit { -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class Download : GLib.Object { -- [CCode (has_construct_function = false)] -- public Download (WebKit.NetworkRequest request); -- public void cancel (); -- public uint64 get_current_size (); -- public unowned string get_destination_uri (); -- public double get_elapsed_time (); -- public unowned WebKit.NetworkRequest get_network_request (); -- public unowned WebKit.NetworkResponse get_network_response (); -- public double get_progress (); -- public WebKit.DownloadStatus get_status (); -- public unowned string get_suggested_filename (); -- public uint64 get_total_size (); -- public unowned string get_uri (); -- public void set_destination_uri (string destination_uri); -- public void start (); -- public uint64 current_size { get; } -- public string destination_uri { get; set; } -- public WebKit.NetworkRequest network_request { get; construct; } -- public WebKit.NetworkResponse network_response { get; construct; } -- public double progress { get; } -- public WebKit.DownloadStatus status { get; } -- public string suggested_filename { get; } -- public uint64 total_size { get; } -- public virtual signal bool error (int p0, int p1, string p2); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class GeolocationPolicyDecision : GLib.Object { -- [CCode (has_construct_function = false)] -- protected GeolocationPolicyDecision (); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class HitTestResult : GLib.Object { -- [CCode (has_construct_function = false)] -- protected HitTestResult (); -- [NoAccessorMethod] -- public WebKit.HitTestResultContext context { get; construct; } -- [NoAccessorMethod] -- public string image_uri { owned get; construct; } -- [NoAccessorMethod] -- public string link_uri { owned get; construct; } -- [NoAccessorMethod] -- public string media_uri { owned get; construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class NetworkRequest : GLib.Object { -- [CCode (has_construct_function = false)] -- public NetworkRequest (string uri); -- public unowned Soup.Message get_message (); -- public unowned string get_uri (); -- public void set_uri (string uri); -- public Soup.Message message { get; construct; } -- public string uri { get; set; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class NetworkResponse : GLib.Object { -- [CCode (has_construct_function = false)] -- public NetworkResponse (string uri); -- public unowned Soup.Message get_message (); -- public unowned string get_uri (); -- public void set_uri (string uri); -- public Soup.Message message { get; construct; } -- public string uri { get; set; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class SecurityOrigin : GLib.Object { -- [CCode (has_construct_function = false)] -- protected SecurityOrigin (); -- public unowned GLib.List get_all_web_databases (); -- public unowned string get_host (); -- public uint get_port (); -- public unowned string get_protocol (); -- public uint64 get_web_database_quota (); -- public uint64 get_web_database_usage (); -- public void set_web_database_quota (uint64 quota); -- public string host { get; } -- public uint port { get; } -- public string protocol { get; } -- public uint64 web_database_quota { get; set; } -- public uint64 web_database_usage { get; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class SoupAuthDialog : GLib.Object, Soup.SessionFeature { -- [CCode (has_construct_function = false)] -- protected SoupAuthDialog (); -- public virtual signal unowned Gtk.Widget current_toplevel (Soup.Message message); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebBackForwardList : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebBackForwardList (); -- public void add_item (WebKit.WebHistoryItem history_item); -- public void clear (); -- public bool contains_item (WebKit.WebHistoryItem history_item); -- public unowned WebKit.WebHistoryItem get_back_item (); -- public int get_back_length (); -- public unowned GLib.List get_back_list_with_limit (int limit); -- public unowned WebKit.WebHistoryItem get_current_item (); -- public unowned WebKit.WebHistoryItem get_forward_item (); -- public int get_forward_length (); -- public unowned GLib.List get_forward_list_with_limit (int limit); -- public int get_limit (); -- public unowned WebKit.WebHistoryItem get_nth_item (int index); -- public void go_back (); -- public void go_forward (); -- public void go_to_item (WebKit.WebHistoryItem history_item); -- public void set_limit (int limit); -- [CCode (has_construct_function = false)] -- public WebBackForwardList.with_web_view (WebKit.WebView web_view); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebDataSource : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebDataSource (); -- public unowned GLib.StringBuilder get_data (); -- public unowned string get_encoding (); -- public unowned WebKit.NetworkRequest get_initial_request (); -- public unowned WebKit.WebResource get_main_resource (); -- public unowned WebKit.NetworkRequest get_request (); -- public unowned GLib.List get_subresources (); -- public unowned string get_unreachable_uri (); -- public unowned WebKit.WebFrame get_web_frame (); -- public bool is_loading (); -- [CCode (has_construct_function = false)] -- public WebDataSource.with_request (WebKit.NetworkRequest request); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebDatabase : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebDatabase (); -- public unowned string get_display_name (); -- public uint64 get_expected_size (); -- public unowned string get_filename (); -- public unowned string get_name (); -- public unowned WebKit.SecurityOrigin get_security_origin (); -- public uint64 get_size (); -- public void remove (); -- public string display_name { get; } -- public uint64 expected_size { get; } -- public string filename { get; } -- public string name { get; construct; } -- public WebKit.SecurityOrigin security_origin { get; construct; } -- public uint64 size { get; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebFrame : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebFrame (WebKit.WebView web_view); -- public unowned WebKit.WebFrame find_frame (string name); -- public unowned WebKit.WebDataSource get_data_source (); -- public Gtk.PolicyType get_horizontal_scrollbar_policy (); -- public WebKit.LoadStatus get_load_status (); -- public unowned string get_name (); -- public unowned WebKit.NetworkResponse get_network_response (); -- public unowned WebKit.WebFrame get_parent (); -- public unowned WebKit.WebDataSource get_provisional_data_source (); -- public unowned WebKit.SecurityOrigin get_security_origin (); -- public unowned string get_title (); -- public unowned string get_uri (); -- public Gtk.PolicyType get_vertical_scrollbar_policy (); -- public unowned WebKit.WebView get_web_view (); -- public void load_alternate_string (string content, string base_url, string unreachable_url); -- public void load_request (WebKit.NetworkRequest request); -- public void load_string (string content, string mime_type, string encoding, string base_uri); -- public void load_uri (string uri); -- public void print (); -- public Gtk.PrintOperationResult print_full (Gtk.PrintOperation operation, Gtk.PrintOperationAction action) throws GLib.Error; -- public void reload (); -- public void stop_loading (); -- public Gtk.PolicyType horizontal_scrollbar_policy { get; } -- public WebKit.LoadStatus load_status { get; } -- public string name { get; } -- public string title { get; } -- public string uri { get; } -- public Gtk.PolicyType vertical_scrollbar_policy { get; } -- public virtual signal void cleared (); -- public virtual signal void hovering_over_link (string p0, string p1); -- public virtual signal void load_committed (); -- public virtual signal void load_done (bool p0); -- public virtual signal bool scrollbars_policy_changed (); -- public virtual signal void title_changed (string p0); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebHistoryItem : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebHistoryItem (); -- public unowned WebKit.WebHistoryItem copy (); -- public unowned string get_alternate_title (); -- public double get_last_visited_time (); -- public unowned string get_original_uri (); -- public unowned string get_title (); -- public unowned string get_uri (); -- public void set_alternate_title (string title); -- [CCode (has_construct_function = false)] -- public WebHistoryItem.with_data (string uri, string title); -- public string alternate_title { get; set; } -- public double last_visited_time { get; } -- public string original_uri { get; } -- public string title { get; } -- public string uri { get; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebInspector : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebInspector (); -- public void close (); -- public unowned string get_inspected_uri (); -- public unowned WebKit.WebView get_web_view (); -- public void inspect_coordinates (double x, double y); -- public void show (); -- public string inspected_uri { get; } -- [NoAccessorMethod] -- public bool javascript_profiling_enabled { get; set; } -- [NoAccessorMethod] -- public bool timeline_profiling_enabled { get; set; } -- public WebKit.WebView web_view { get; } -- public virtual signal bool attach_window (); -- public virtual signal bool close_window (); -- public virtual signal bool detach_window (); -- public virtual signal void finished (); -- public virtual signal unowned WebKit.WebView inspect_web_view (WebKit.WebView p0); -- public virtual signal bool show_window (); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebNavigationAction : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebNavigationAction (); -- public int get_button (); -- public int get_modifier_state (); -- public unowned string get_original_uri (); -- public WebKit.WebNavigationReason get_reason (); -- public unowned string get_target_frame (); -- public void set_original_uri (string originalUri); -- public void set_reason (WebKit.WebNavigationReason reason); -- public int button { get; construct; } -- public int modifier_state { get; construct; } -- public string original_uri { get; set construct; } -- public WebKit.WebNavigationReason reason { get; set construct; } -- public string target_frame { get; construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebPolicyDecision : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebPolicyDecision (); -- public void download (); -- public void ignore (); -- public void use (); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebResource : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebResource (string data, ssize_t size, string uri, string mime_type, string encoding, string frame_name); -- public unowned GLib.StringBuilder get_data (); -- public unowned string get_encoding (); -- public unowned string get_frame_name (); -- public unowned string get_mime_type (); -- public unowned string get_uri (); -- public string encoding { get; } -- public string frame_name { get; } -- public string mime_type { get; } -- public string uri { get; construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebSettings : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebSettings (); -- public WebKit.WebSettings copy (); -- public unowned string get_user_agent (); -- [NoAccessorMethod] -- public bool auto_load_images { get; set construct; } -- [NoAccessorMethod] -- public bool auto_resize_window { get; set construct; } -- [NoAccessorMethod] -- public bool auto_shrink_images { get; set construct; } -- [NoAccessorMethod] -- public string cursive_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public string default_encoding { owned get; set construct; } -- [NoAccessorMethod] -- public string default_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public int default_font_size { get; set construct; } -- [NoAccessorMethod] -- public int default_monospace_font_size { get; set construct; } -- [NoAccessorMethod] -- public WebKit.EditingBehavior editing_behavior { get; set construct; } -- [NoAccessorMethod] -- public bool enable_caret_browsing { get; set construct; } -- [NoAccessorMethod] -- public bool enable_default_context_menu { get; set construct; } -- [NoAccessorMethod] -- public bool enable_developer_extras { get; set construct; } -- [NoAccessorMethod] -- public bool enable_dom_paste { get; set construct; } -- [NoAccessorMethod] -- public bool enable_file_access_from_file_uris { get; set construct; } -- [NoAccessorMethod] -- public bool enable_html5_database { get; set construct; } -- [NoAccessorMethod] -- public bool enable_html5_local_storage { get; set construct; } -- [NoAccessorMethod] -- public bool enable_java_applet { get; set construct; } -- [NoAccessorMethod] -- public bool enable_offline_web_application_cache { get; set construct; } -- [NoAccessorMethod] -- public bool enable_page_cache { get; set construct; } -- [NoAccessorMethod] -- public bool enable_plugins { get; set construct; } -- [NoAccessorMethod] -- public bool enable_private_browsing { get; set construct; } -- [NoAccessorMethod] -- public bool enable_scripts { get; set construct; } -- [NoAccessorMethod] -- public bool enable_site_specific_quirks { get; set construct; } -- [NoAccessorMethod] -- public bool enable_spatial_navigation { get; set construct; } -- [NoAccessorMethod] -- public bool enable_spell_checking { get; set construct; } -- [NoAccessorMethod] -- public bool enable_universal_access_from_file_uris { get; set construct; } -- [NoAccessorMethod] -- public bool enable_xss_auditor { get; set construct; } -- [NoAccessorMethod] -- public bool enforce_96_dpi { get; set construct; } -- [NoAccessorMethod] -- public string fantasy_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public bool javascript_can_access_clipboard { get; set construct; } -- [NoAccessorMethod] -- public bool javascript_can_open_windows_automatically { get; set construct; } -- [NoAccessorMethod] -- public int minimum_font_size { get; set construct; } -- [NoAccessorMethod] -- public int minimum_logical_font_size { get; set construct; } -- [NoAccessorMethod] -- public string monospace_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public bool print_backgrounds { get; set construct; } -- [NoAccessorMethod] -- public bool resizable_text_areas { get; set construct; } -- [NoAccessorMethod] -- public string sans_serif_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public string serif_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public string spell_checking_languages { owned get; set construct; } -- [NoAccessorMethod] -- public bool tab_key_cycles_through_elements { get; set construct; } -- [NoAccessorMethod] -- public string user_agent { owned get; set construct; } -- [NoAccessorMethod] -- public string user_stylesheet_uri { owned get; set construct; } -- [NoAccessorMethod] -- public float zoom_step { get; set construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable { -- [CCode (type = "GtkWidget*", has_construct_function = false)] -- public WebView (); -- public bool can_copy_clipboard (); -- public bool can_cut_clipboard (); -- public bool can_go_back (); -- public bool can_go_back_or_forward (int steps); -- public bool can_go_forward (); -- public bool can_paste_clipboard (); -- public bool can_redo (); -- public bool can_show_mime_type (string mime_type); -- public bool can_undo (); -- [NoWrapper] -- public virtual unowned string choose_file (WebKit.WebFrame frame, string old_file); -- public void delete_selection (); -- public void execute_script (string script); -- public unowned WebKit.WebBackForwardList get_back_forward_list (); -- public unowned Gtk.TargetList get_copy_target_list (); -- public unowned string get_custom_encoding (); -- public bool get_editable (); -- public unowned string get_encoding (); -- public unowned WebKit.WebFrame get_focused_frame (); -- public bool get_full_content_zoom (); -- public unowned WebKit.HitTestResult get_hit_test_result (Gdk.EventButton event); -- public unowned string get_icon_uri (); -- public unowned WebKit.WebInspector get_inspector (); -- public WebKit.LoadStatus get_load_status (); -- public unowned WebKit.WebFrame get_main_frame (); -- public unowned Gtk.TargetList get_paste_target_list (); -- public double get_progress (); -- public unowned WebKit.WebSettings get_settings (); -- public unowned string get_title (); -- public bool get_transparent (); -- public unowned string get_uri (); -- public bool get_view_source_mode (); -- public unowned WebKit.WebWindowFeatures get_window_features (); -- public float get_zoom_level (); -- public void go_back (); -- public void go_back_or_forward (int steps); -- public void go_forward (); -- public bool go_to_back_forward_item (WebKit.WebHistoryItem item); -- public bool has_selection (); -- public void load_html_string (string content, string base_uri); -- public void load_request (WebKit.NetworkRequest request); -- public void load_string (string content, string mime_type, string encoding, string base_uri); -- public void load_uri (string uri); -- public uint mark_text_matches (string str, bool case_sensitive, uint limit); -- public void open (string uri); -- public void reload (); -- public void reload_bypass_cache (); -- public bool search_text (string text, bool case_sensitive, bool forward, bool wrap); -- public void set_custom_encoding (string encoding); -- public void set_editable (bool flag); -- public void set_full_content_zoom (bool full_content_zoom); -- public void set_highlight_text_matches (bool highlight); -- public void set_maintains_back_forward_list (bool flag); -- public void set_settings (WebKit.WebSettings settings); -- public void set_transparent (bool flag); -- public void set_view_source_mode (bool view_source_mode); -- public void set_zoom_level (float zoom_level); -- public void stop_loading (); -- public void unmark_text_matches (); -- public void zoom_in (); -- public void zoom_out (); -- public Gtk.TargetList copy_target_list { get; } -- public string custom_encoding { get; set; } -- public bool editable { get; set; } -- public string encoding { get; } -- public bool full_content_zoom { get; set; } -- public string icon_uri { get; } -- [NoAccessorMethod] -- public Gtk.IMContext im_context { owned get; } -- public WebKit.LoadStatus load_status { get; } -- public Gtk.TargetList paste_target_list { get; } -- public double progress { get; } -- public WebKit.WebSettings settings { get; set; } -- public string title { get; } -- public bool transparent { get; set; } -- public string uri { get; } -- [NoAccessorMethod] -- public WebKit.WebInspector web_inspector { owned get; } -- [NoAccessorMethod] -- public WebKit.WebWindowFeatures window_features { owned get; set; } -- public float zoom_level { get; set; } -- public virtual signal bool close_web_view (); -- public virtual signal bool console_message (string message, int line_number, string source_id); -- [HasEmitter] -- public virtual signal void copy_clipboard (); -- public virtual signal unowned Gtk.Widget create_plugin_widget (string p0, string p1, GLib.HashTable p2); -- public virtual signal WebKit.WebView create_web_view (WebKit.WebFrame web_frame); -- [HasEmitter] -- public virtual signal void cut_clipboard (); -- public virtual signal void database_quota_exceeded (GLib.Object p0, GLib.Object p1); -- public virtual signal void document_load_finished (WebKit.WebFrame p0); -- public virtual signal bool download_requested (GLib.Object p0); -- public virtual signal void geolocation_policy_decision_cancelled (WebKit.WebFrame p0); -- public virtual signal bool geolocation_policy_decision_requested (WebKit.WebFrame p0, WebKit.GeolocationPolicyDecision p1); -- public virtual signal void hovering_over_link (string? p0, string p1); -- public virtual signal void icon_loaded (string p0); -- public virtual signal void load_committed (WebKit.WebFrame p0); -- public virtual signal bool load_error (WebKit.WebFrame p0, string p1, GLib.Error p2); -- public virtual signal void load_finished (WebKit.WebFrame p0); -- public virtual signal void load_progress_changed (int p0); -- public virtual signal void load_started (WebKit.WebFrame p0); -- public virtual signal bool mime_type_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, string p2, WebKit.WebPolicyDecision p3); -- [HasEmitter] -- public virtual signal bool move_cursor (Gtk.MovementStep step, int count); -- public virtual signal bool navigation_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3); -- public virtual signal WebKit.NavigationResponse navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request); -- public virtual signal bool new_window_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3); -- [HasEmitter] -- public virtual signal void paste_clipboard (); -- public virtual signal void populate_popup (Gtk.Menu p0); -- public virtual signal bool print_requested (WebKit.WebFrame p0); -- [HasEmitter] -- public virtual signal void redo (); -- public virtual signal void resource_request_starting (WebKit.WebFrame p0, WebKit.WebResource p1, WebKit.NetworkRequest p2, WebKit.NetworkResponse p3); -- public virtual signal bool script_alert (WebKit.WebFrame frame, string alert_message); -- public virtual signal bool script_confirm (WebKit.WebFrame frame, string confirm_message, void* did_confirm); -- public virtual signal bool script_prompt (WebKit.WebFrame frame, string message, string default_value, void* value); -- [HasEmitter] -- public virtual signal void select_all (); -- public virtual signal void selection_changed (); -- public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); -- public virtual signal void status_bar_text_changed (string p0); -- public virtual signal void title_changed (WebKit.WebFrame p0, string p1); -- [HasEmitter] -- public virtual signal void undo (); -- public virtual signal bool web_view_ready (); -- public virtual signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebWindowFeatures : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebWindowFeatures (); -- public bool equal (WebKit.WebWindowFeatures features2); -- [NoAccessorMethod] -- public bool fullscreen { get; set construct; } -- [NoAccessorMethod] -- public int height { get; set construct; } -- [NoAccessorMethod] -- public bool locationbar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool menubar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool scrollbar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool statusbar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool toolbar_visible { get; set construct; } -- [NoAccessorMethod] -- public int width { get; set construct; } -- [NoAccessorMethod] -- public int x { get; set construct; } -- [NoAccessorMethod] -- public int y { get; set construct; } -- } -- [CCode (cprefix = "WEBKIT_CACHE_MODEL_", cheader_filename = "webkit/webkit.h")] -- public enum CacheModel { -- DOCUMENT_VIEWER, -- WEB_BROWSER -- } -- [CCode (cprefix = "WEBKIT_DOWNLOAD_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum DownloadError { -- CANCELLED_BY_USER, -- DESTINATION, -- NETWORK -- } -- [CCode (cprefix = "WEBKIT_DOWNLOAD_STATUS_", cheader_filename = "webkit/webkit.h")] -- public enum DownloadStatus { -- ERROR, -- CREATED, -- STARTED, -- CANCELLED, -- FINISHED -- } -- [CCode (cprefix = "WEBKIT_EDITING_BEHAVIOR_", cheader_filename = "webkit/webkit.h")] -- public enum EditingBehavior { -- MAC, -- WINDOWS -- } -- [CCode (cprefix = "WEBKIT_HIT_TEST_RESULT_CONTEXT_", cheader_filename = "webkit/webkit.h")] -- [Flags] -- public enum HitTestResultContext { -- DOCUMENT, -- LINK, -- IMAGE, -- MEDIA, -- SELECTION, -- EDITABLE -- } -- [CCode (cprefix = "WEBKIT_LOAD_", cheader_filename = "webkit/webkit.h")] -- public enum LoadStatus { -- PROVISIONAL, -- COMMITTED, -- FINISHED, -- FIRST_VISUALLY_NON_EMPTY_LAYOUT, -- FAILED -- } -- [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", cheader_filename = "webkit/webkit.h")] -- public enum NavigationResponse { -- ACCEPT, -- IGNORE, -- DOWNLOAD -- } -- [CCode (cprefix = "WEBKIT_NETWORK_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum NetworkError { -- FAILED, -- TRANSPORT, -- UNKNOWN_PROTOCOL, -- CANCELLED, -- FILE_DOES_NOT_EXIST -- } -- [CCode (cprefix = "WEBKIT_PLUGIN_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum PluginError { -- FAILED, -- CANNOT_FIND_PLUGIN, -- CANNOT_LOAD_PLUGIN, -- JAVA_UNAVAILABLE, -- CONNECTION_CANCELLED, -- WILL_HANDLE_LOAD -- } -- [CCode (cprefix = "WEBKIT_POLICY_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum PolicyError { -- FAILED, -- CANNOT_SHOW_MIME_TYPE, -- CANNOT_SHOW_URL, -- FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, -- CANNOT_USE_RESTRICTED_PORT -- } -- [CCode (cprefix = "WEBKIT_WEB_NAVIGATION_REASON_", cheader_filename = "webkit/webkit.h")] -- public enum WebNavigationReason { -- LINK_CLICKED, -- FORM_SUBMITTED, -- BACK_FORWARD, -- RELOAD, -- FORM_RESUBMITTED, -- OTHER -- } -- [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", cheader_filename = "webkit/webkit.h")] -- public enum WebViewTargetInfo { -- HTML, -- TEXT, -- IMAGE, -- URI_LIST, -- NETSCAPE_URL -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int MAJOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int MICRO_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int MINOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int USER_AGENT_MAJOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int USER_AGENT_MINOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static bool check_version (uint major, uint minor, uint micro); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void geolocation_policy_allow (WebKit.GeolocationPolicyDecision decision); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void geolocation_policy_deny (WebKit.GeolocationPolicyDecision decision); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static WebKit.CacheModel get_cache_model (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static unowned Soup.Session get_default_session (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint64 get_default_web_database_quota (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static unowned string get_web_database_directory_path (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint major_version (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint micro_version (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint minor_version (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static GLib.Quark network_error_quark (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static GLib.Quark plugin_error_quark (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static GLib.Quark policy_error_quark (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void remove_all_web_databases (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void set_cache_model (WebKit.CacheModel cache_model); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void set_default_web_database_quota (uint64 defaultQuota); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void set_web_database_directory_path (string path); --} --- -2.5.0 \ No newline at end of file diff -Nru shotwell-0.28.4/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch shotwell-0.30.2/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch --- shotwell-0.28.4/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch 2015-12-13 08:00:50.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -From 130ebe6f1eda9564e89ab617bdfa30a50f828e47 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 4 Dec 2015 17:33:43 +0100 -Subject: [PATCH] Don't pack webview into a scrolled window - -The scrollbar is drawn by WebKitWebView in WK2. - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - plugins/common/RESTSupport.vala | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -Index: trunk/plugins/common/RESTSupport.vala -=================================================================== ---- trunk.orig/plugins/common/RESTSupport.vala -+++ trunk/plugins/common/RESTSupport.vala -@@ -725,7 +725,6 @@ public abstract class GooglePublisher : - - private WebKit.WebView webview; - private Gtk.Box pane_widget; -- private Gtk.ScrolledWindow webview_frame; - private string auth_sequence_start_url; - - public signal void authorized(string auth_code); -@@ -735,18 +734,13 @@ public abstract class GooglePublisher : - - pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0); - -- webview_frame = new Gtk.ScrolledWindow(null, null); -- webview_frame.set_shadow_type(Gtk.ShadowType.ETCHED_IN); -- webview_frame.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); -- - webview = new WebKit.WebView(); - webview.get_settings().enable_plugins = false; - - webview.load_changed.connect(on_page_load_changed); - webview.context_menu.connect(() => { return false; }); - -- webview_frame.add(webview); -- pane_widget.pack_start(webview_frame, true, true, 0); -+ pane_widget.pack_start(webview, true, true, 0); - } - - public static bool is_cache_dirty() { diff -Nru shotwell-0.28.4/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch shotwell-0.30.2/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch --- shotwell-0.28.4/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch 2015-12-13 08:00:58.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From ac6efab13554d1ef39eb8b86744234d72773c2da Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 4 Dec 2015 17:34:17 +0100 -Subject: [PATCH] Have all soup sessions validate TLS certificates - -Note that this commit is *not* sufficient to fix certificate verification -on its own. The port to WK2 is also required, else WebKit's soup session -will not verify certificates. - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - plugins/common/RESTSupport.vala | 1 + - plugins/shotwell-publishing/FacebookPublishing.vala | 1 + - 2 files changed, 2 insertions(+) - -Index: trunk/plugins/common/RESTSupport.vala -=================================================================== ---- trunk.orig/plugins/common/RESTSupport.vala -+++ trunk/plugins/common/RESTSupport.vala -@@ -20,6 +20,7 @@ public abstract class Session { - public Session(string? endpoint_url = null) { - this.endpoint_url = endpoint_url; - soup_session = new Soup.SessionAsync(); -+ this.soup_session.ssl_use_system_ca_file = true; - } - - protected void notify_wire_message_unqueued(Soup.Message message) { -Index: trunk/plugins/shotwell-publishing/FacebookPublishing.vala -=================================================================== ---- trunk.orig/plugins/shotwell-publishing/FacebookPublishing.vala -+++ trunk/plugins/shotwell-publishing/FacebookPublishing.vala -@@ -1473,6 +1473,7 @@ internal class GraphSession { - this.soup_session.timeout = 15; - this.access_token = null; - this.current_message = null; -+ this.soup_session.ssl_use_system_ca_file = true; - } - - ~GraphSession() { diff -Nru shotwell-0.28.4/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch shotwell-0.30.2/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch --- shotwell-0.28.4/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch 2015-12-13 08:01:05.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From 2a1dd48e702b0e8524a4ed212252aa4c49c6b0f0 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 4 Dec 2015 18:08:54 +0100 -Subject: [PATCH] facebook: Don't disable XSS auditor - -This is a separate commit to make it possible to revert easily, as -I don't know why it was disabled. - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - plugins/shotwell-publishing/FacebookPublishing.vala | 1 - - 1 file changed, 1 deletion(-) - -Index: trunk/plugins/shotwell-publishing/FacebookPublishing.vala -=================================================================== ---- trunk.orig/plugins/shotwell-publishing/FacebookPublishing.vala -+++ trunk/plugins/shotwell-publishing/FacebookPublishing.vala -@@ -829,7 +829,6 @@ internal class WebAuthenticationPane : S - - webview = new WebKit.WebView(); - webview.get_settings().enable_plugins = false; -- webview.get_settings().enable_xss_auditor = false; - - webview.load_changed.connect(on_page_load_changed); - webview.context_menu.connect(() => { return true; }); diff -Nru shotwell-0.28.4/debian/patches/0510-Delay_size_request.patch shotwell-0.30.2/debian/patches/0510-Delay_size_request.patch --- shotwell-0.28.4/debian/patches/0510-Delay_size_request.patch 2016-06-05 20:11:59.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0510-Delay_size_request.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: Delay size_request -Author: Jens Georg -Origin: https://git.gnome.org/browse/shotwell/commit/?id=4a70d87 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=766864 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823835 -Forwarded: not-needed -Last-Update: 2015-06-05 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/CheckerboardLayout.vala -=================================================================== ---- trunk.orig/src/CheckerboardLayout.vala -+++ trunk/src/CheckerboardLayout.vala -@@ -911,7 +911,11 @@ public class CheckerboardLayout : Gtk.Dr - debug("on_viewport_resized: due_to_reflow=%s set_size_request %dx%d", - size_allocate_due_to_reflow.to_string(), parent_allocation.width, req.height); - #endif -- set_size_request(parent_allocation.width - SCROLLBAR_PLACEHOLDER_WIDTH, req.height); -+ // But if the current height is 0, don't request a size yet. Delay -+ // it to do_reflow (bgo#766864) -+ if (req.height != 0) { -+ set_size_request(parent_allocation.width - SCROLLBAR_PLACEHOLDER_WIDTH, req.height); -+ } - } else { - // set the layout's width and height to always match the parent's - set_size_request(parent_allocation.width, parent_allocation.height); diff -Nru shotwell-0.28.4/debian/patches/0515-Fix_background_color_drawing.patch shotwell-0.30.2/debian/patches/0515-Fix_background_color_drawing.patch --- shotwell-0.28.4/debian/patches/0515-Fix_background_color_drawing.patch 2016-06-05 20:15:10.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0515-Fix_background_color_drawing.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Description: Fix background color drawing -Author: Jens Georg -Origin: https://git.gnome.org/browse/shotwell/commit/?id=7361b3f -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=766864 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823835 -Forwarded: not-needed -Last-Update: 2015-06-05 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/CheckerboardLayout.vala -=================================================================== ---- trunk.orig/src/CheckerboardLayout.vala -+++ trunk/src/CheckerboardLayout.vala -@@ -1812,6 +1812,10 @@ public class CheckerboardLayout : Gtk.Dr - // we want switched_to() to be the final call in the process (indicating that the page is - // now in place and should do its thing to update itself), have to be be prepared for - // GTK/GDK calls between the widgets being actually present on the screen and "switched to" -+ -+ Gtk.Allocation allocation; -+ get_allocation(out allocation); -+ get_style_context().render_background (ctx, 0, 0, allocation.width, allocation.height); - - // watch for message mode - if (message == null) { -@@ -1833,7 +1837,6 @@ public class CheckerboardLayout : Gtk.Dr - int text_width, text_height; - pango_layout.get_pixel_size(out text_width, out text_height); - -- Gtk.Allocation allocation; - get_allocation(out allocation); - - int x = allocation.width - text_width; diff -Nru shotwell-0.28.4/debian/patches/0600-remove_wrong_marco.patch shotwell-0.30.2/debian/patches/0600-remove_wrong_marco.patch --- shotwell-0.28.4/debian/patches/0600-remove_wrong_marco.patch 2016-08-20 18:27:01.000000000 +0000 +++ shotwell-0.30.2/debian/patches/0600-remove_wrong_marco.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Remove wrong macro 'R' from manpage -Author: Jörg Frings-Fürst -Last-Update: 2016-08-20 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/help/shotwell.1 -=================================================================== ---- trunk.orig/help/shotwell.1 -+++ trunk/help/shotwell.1 -@@ -13,7 +13,8 @@ import photos from disk or camera, organ - - .SH "OPTIONS" - .B \-h, \-\-help --.R Show help options -+Show help options -+.RE - - .B \-d, \-\-datadir=DIRECTORY - .RS diff -Nru shotwell-0.28.4/debian/patches/505-fix-viewer-desktop-file.patch shotwell-0.30.2/debian/patches/505-fix-viewer-desktop-file.patch --- shotwell-0.28.4/debian/patches/505-fix-viewer-desktop-file.patch 2015-04-03 12:10:57.000000000 +0000 +++ shotwell-0.30.2/debian/patches/505-fix-viewer-desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Description: Fix viewer desktop file - A typo in the Makefile, probably due to a quick copy/paste, results in an - incorrectly generated desktop file for the photo viewer. -Author: Raphaël Halimi -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776745 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=743799 -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=743799 -Applied-Upstream: 0.22.0, https://git.gnome.org/browse/shotwell/commit/?id=2ecda59a5562565967647b6c3d44dd99a48a04ef -Last-Update: 2015-04-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -493,9 +493,8 @@ endif - misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES) - cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop - $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \ -- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \ -- echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \ -- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \ -+ LANGUAGE=$(lang) gettext --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` \ -+ >> misc/shotwell-viewer.desktop ; \ - echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \ - --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;) - ifndef DISABLE_DESKTOP_VALIDATE diff -Nru shotwell-0.28.4/debian/patches/git_glib_bindingflags.patch shotwell-0.30.2/debian/patches/git_glib_bindingflags.patch --- shotwell-0.28.4/debian/patches/git_glib_bindingflags.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/debian/patches/git_glib_bindingflags.patch 2019-04-09 14:10:45.000000000 +0000 @@ -0,0 +1,21 @@ +commit d5d38757ed367d80dcae4ae7f08c9420595c0686 +Author: Rico Tzschichholz +Date: Thu Feb 28 20:05:30 2019 +0100 + + publishing: Fix references to GLib.BindingFlags + +diff --git a/plugins/shotwell-publishing/PhotosPublishingPane.vala b/plugins/shotwell-publishing/PhotosPublishingPane.vala +index 32ccf8a7..d1b00d6a 100644 +--- a/plugins/shotwell-publishing/PhotosPublishingPane.vala ++++ b/plugins/shotwell-publishing/PhotosPublishingPane.vala +@@ -75,8 +75,8 @@ internal class PublishingOptionsPane : Gtk.Box, Spit.Publishing.DialogPane { + size_combo.set_active(parameters.get_major_axis_size_selection_id()); + } + +- existing_album_radio.bind_property("active", existing_albums_combo, "sensitive", GLib.Binding.SYNC_CREATE); +- new_album_radio.bind_property("active", new_album_entry, "sensitive", GLib.Binding.SYNC_CREATE); ++ existing_album_radio.bind_property("active", existing_albums_combo, "sensitive", GLib.BindingFlags.SYNC_CREATE); ++ new_album_radio.bind_property("active", new_album_entry, "sensitive", GLib.BindingFlags.SYNC_CREATE); + + publish_button.clicked.connect (on_publish_clicked); + logout_button.clicked.connect (on_logout_clicked); diff -Nru shotwell-0.28.4/debian/patches/series shotwell-0.30.2/debian/patches/series --- shotwell-0.28.4/debian/patches/series 2018-07-09 10:10:39.000000000 +0000 +++ shotwell-0.30.2/debian/patches/series 2019-04-09 14:11:48.000000000 +0000 @@ -1,13 +1,3 @@ -#0001-buildflags.patch -#0005-hardening.patch -#0010-libexec.patch -#0500-Port-to-webkit2gtk-40.patch -#0501-Dont-pack-webview-into-a-scrolled-window.patch -#0502-Have-all-soup-sessions-validate-TLS-certificates.patch -#0503-facebook-Dont-disable-XSS-auditor.patch -#0600-remove_wrong_marco.patch -#0100-ios8.patch -#0510-Delay_size_request.patch -#0515-Fix_background_color_drawing.patch -#505-fix-viewer-desktop-file.patch -0105-gitversion.patch +# Rebase or drop this patch +# 0100-ios8.patch +git_glib_bindingflags.patch diff -Nru shotwell-0.28.4/debian/replace_thumbnailer.sh shotwell-0.30.2/debian/replace_thumbnailer.sh --- shotwell-0.28.4/debian/replace_thumbnailer.sh 2015-01-22 18:05:02.000000000 +0000 +++ shotwell-0.30.2/debian/replace_thumbnailer.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#! /bin/bash - -if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then - echo ' /usr/lib/shotwell-video-thumbnailer.org exists!' - echo ' break' - exit 1 -fi - -echo '**** backup ****' -mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - -echo '**** install ffmpegthumbnailer ****' -apt-get install ffmpegthumbnailer -y - -echo '**** install new file ****' -touch /usr/lib/shotwell-video-thumbnailer -chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - -echo '#! /bin/bash' >/usr/lib/shotwell-video-thumbnailer -echo '' >>/usr/lib/shotwell-video-thumbnailer -echo 'ffmpegthumbnailer -i "$1" -o - -c png' >>/usr/lib/shotwell-video-thumbnailer diff -Nru shotwell-0.28.4/debian/rules shotwell-0.30.2/debian/rules --- shotwell-0.28.4/debian/rules 2018-05-01 15:07:58.000000000 +0000 +++ shotwell-0.30.2/debian/rules 2019-02-20 16:25:19.000000000 +0000 @@ -2,21 +2,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) - -B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") - %: - dh $@ + dh $@ --with gnome --buildsystem=meson override_dh_auto_configure: - dh_auto_configure -- --prefix=/usr \ + dh_auto_configure -- \ --libexec=/usr/lib \ - --disable-schemas-compile + -Denable-unity-support=true \ + -Dinstall-apport-hook=true -override_dh_install: - dh_install - # Remove unwanted la files - rm -f debian/shotwell/usr/lib/*/shotwell/plugins/builtin/*.la - rm -f debian/shotwell/usr/lib/*/*shotwell*.a - rm -f debian/shotwell/usr/lib/*/*shotwell*.la +override_dh_gnome_clean: + dh_gnome_clean --no-control diff -Nru shotwell-0.28.4/debian/shotwell-common.README.Debian shotwell-0.30.2/debian/shotwell-common.README.Debian --- shotwell-0.28.4/debian/shotwell-common.README.Debian 2015-04-06 04:27:22.000000000 +0000 +++ shotwell-0.30.2/debian/shotwell-common.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -TROUBLESHOOTING ---------------- - -- video-thumbnailer - - On problems with the shotwell-video-thumbnailer you can - switch to the ffmpegthumnailer. Please run as root: - - 1. Backup /usr/lib/shotwell-video-thumbnailer: - * mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - - 2. Install ffmpegthumbnailer: - * apt-get install ffmpegthumbnailer - - 3. Create a new executable file: - * touch /usr/lib/shotwell-video-thumbnailer - * chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - - 4. Write into the new file: - * echo "#! /bin/bash" >/usr/lib/shotwell-video-thumbnailer - * echo "ffmpegthumnailer -i \"$1\" -o -b -c png >>/usr/lib/shotwell-video-thumbnailer - - Or you can use the file replace_thumbnail.sh from the examples directory. - - Thanks to Teo Romera diff -Nru shotwell-0.28.4/debian/shotwell-common.postrm shotwell-0.30.2/debian/shotwell-common.postrm --- shotwell-0.28.4/debian/shotwell-common.postrm 2016-08-20 21:08:13.000000000 +0000 +++ shotwell-0.30.2/debian/shotwell-common.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - - -case "$1" in - purge|remove) - - # - # rebuild icon cache - # - if [ -x gtk-update-icon-cache ] ; then - gtk-update-icon-cache /usr/share/icons/hicolor - fi - -esac - -#DEBHELPER# diff -Nru shotwell-0.28.4/debian/shotwell.README.Debian shotwell-0.30.2/debian/shotwell.README.Debian --- shotwell-0.28.4/debian/shotwell.README.Debian 2015-04-06 04:27:22.000000000 +0000 +++ shotwell-0.30.2/debian/shotwell.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -TROUBLESHOOTING ---------------- - -- video-thumbnailer - - On problems with the shotwell-video-thumbnailer you can - switch to the ffmpegthumnailer. Please run as root: - - 1. Backup /usr/lib/shotwell-video-thumbnailer: - * mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - - 2. Install ffmpegthumbnailer: - * apt-get install ffmpegthumbnailer - - 3. Create a new executable file: - * touch /usr/lib/shotwell-video-thumbnailer - * chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - - 4. Write into the new file: - * echo "#! /bin/bash" >/usr/lib/shotwell-video-thumbnailer - * echo "ffmpegthumnailer -i \"$1\" -o -b -c png >>/usr/lib/shotwell-video-thumbnailer - - Or you can use the file replace_thumbnail.sh from the examples directory. - - Thanks to Teo Romera diff -Nru shotwell-0.28.4/debian/shotwell.docs shotwell-0.30.2/debian/shotwell.docs --- shotwell-0.28.4/debian/shotwell.docs 2017-12-15 19:38:57.000000000 +0000 +++ shotwell-0.30.2/debian/shotwell.docs 2019-02-20 16:25:19.000000000 +0000 @@ -1,3 +1,3 @@ -README THANKS NEWS + diff -Nru shotwell-0.28.4/debian/shotwell.examples shotwell-0.30.2/debian/shotwell.examples --- shotwell-0.28.4/debian/shotwell.examples 2015-01-22 18:12:37.000000000 +0000 +++ shotwell-0.30.2/debian/shotwell.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/replace_thumbnailer.sh diff -Nru shotwell-0.28.4/debian/shotwell.install shotwell-0.30.2/debian/shotwell.install --- shotwell-0.28.4/debian/shotwell.install 2017-12-15 19:38:57.000000000 +0000 +++ shotwell-0.30.2/debian/shotwell.install 2019-02-20 16:25:19.000000000 +0000 @@ -1,3 +1,4 @@ usr/bin usr/lib usr/share/applications +usr/share/metainfo diff -Nru shotwell-0.28.4/debian/shotwell.postrm shotwell-0.30.2/debian/shotwell.postrm --- shotwell-0.28.4/debian/shotwell.postrm 2016-06-05 12:30:38.000000000 +0000 +++ shotwell-0.30.2/debian/shotwell.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = purge ]; then - - # - # remove backup files - # - if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then - rm -f /usr/lib/shotwell-video-thumbnailer.org - fi -fi - -#DEBHELPER# diff -Nru shotwell-0.28.4/dist/debian/changelog shotwell-0.30.2/dist/debian/changelog --- shotwell-0.28.4/dist/debian/changelog 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/changelog 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,997 @@ +shotwell (0.27.0-0~jensge1~artful1) artful; urgency=medium + + * Remove F-Spot import support + * Create a commandline utility to test image transformations + * Speed up color transformations a bit + * Bump GTK+ requirement to 3.18 and remove deprecated functions + * Clean-up histogram drawing code + * Run thumbnailer with nice 19 + * Update VAAPI blacklisting for video thumbnailer and new plugin structure + * Add configurable image background + * Split several dialogs from shotwell.ui file + * Move Tumblr to default plugin set + * Remove some unnecessary memcpys on import + * Add Meson build support + * Some more ngettext for plurals + * Add --fullscreen/-f option for viewer + * Add option to install Ubuntu apport hook + * Fix issue when importing to NTFS-backed vboxfs + * Fix GSettings schema search path for running out-of-tree + * Work around "Camera locked: -53" error on GNOME + * Fix issue with missing highlight on dnd actions + + -- Jens Georg Wed, 21 Jun 2017 08:17:24 +0200 + +shotwell (0.26.0-0~jensge1~zesty1) zesty; urgency=medium + + * Translation updates + * Fix build on non-glibc systems + * Fix missing optimisation in standard configure call + + -- Jens Georg Mon, 20 Mar 2017 13:40:51 +0100 + +shotwell (0.25.92-0~jensge1~zesty1) zesty; urgency=medium + + * Fix navigation issue when deleting image in fullscreen view + * Fix toolbox not visible on Mate in fullscreen view + * Fix navigation in viewer when saving modified photo + * Fix wrong macro in manpage + * Clean-up some dependencies + * Make it possible to enable/disable individual publishers + * Remove obsolete UI file + * Move all icons in the resource file + * Move ui files into resources + * Remove obsolete Glade helpers + * Clean-up printing dialog a little + * Piwigo: Append .jpg extension to published raw files + * Fix keyboard accessability of CCW rotation + * Fix massive memory consumption when importing videos + * Fix context menu of viewer + * Fix a useless string copy + * Use defalt measurements depending on locale when none are set + * Translation updates + + -- Jens Georg Thu, 16 Mar 2017 20:01:59 +0100 + +shotwell (0.25.90-0~jensge1~xenial1) xenial; urgency=medium + + * Remove obsolete option to create new folders on Picasa web albums + * Update Google API keys + * Fix Youtube upload by porting to libgdata + * Use embedded thumbnails in RAW files when default developer is set to + Camera + * Remove accidental raw development while importing + * Fix "Export" menu accidently being labelled as "Save As" + + -- Jens Georg Mon, 27 Feb 2017 20:38:51 +0100 + +shotwell (0.25.5-0~jensge1~yakkety1) yakkety; urgency=medium + + * Fix setting of gamma value and color matrix in libraw + * Extract web publishing authenticators into separate library. That should + make it possible to easily support UOA and GOA without patching Shotwell. + * Translation updates + + -- Jens Georg Thu, 23 Feb 2017 18:06:00 +0100 + +shotwell (0.25.4-0~jensge1~yakkety1) yakkety; urgency=high + + * Publishing: Use HTTPS everywhere + * Translation updates + + -- Jens Georg Tue, 31 Jan 2017 21:24:30 +0100 + +shotwell (0.25.3-0~jensge1~yakkety1) yakkety; urgency=medium + + * Fix event page context menu + * Try to guess character set of string when UTF-8 validation fails + * Fix tags context menu + * Properly switch menu bar when changing pages + * Fix rating + * Fix a critical about reparenting a popup menu + * Fix sidebar context menu + * Fix toolbar in camera import page + * Update glade files for all publishers + * Flickr: Simplify OAuth parsing by using libsoup + * Fix accellerators not coming from menu model + * Add -f as shortcut for search bar + * Remove AppMenu, needs more thinking about the design. + * Flickr: Use human-readable size of upload quota + * Fix leave fullscreen option + * Fix upload issues with flickr + * Fix several disabled actions when switching away from pages + * Fix actions in fullscreen + * Fix several typos + * Piwigo: Fix title and comments on upload + * Improved duplicate detection + * Updated translations + + -- Jens Georg Wed, 18 Jan 2017 23:21:38 +0100 + +shotwell (0.25.2-0~jensge1~xenial1) xenial; urgency=medium + + * Fix missing About action + * Fix setting of initial action state + * Fix missing initialzation of several states + * Fix sort order not working + * Fix a critical on startup + * Fix initial sort order + * Fix hiding of search toolbar + * Fix rating filter menu initially being disabled + * Use Gtk.Revealer for bottom toolbar + * Fix a copy and paste error in the publishing result + * Use Application menu + * Fix debian scripts + * Fix filter actions not being active + * Fix initial search bar state not being persisted + * Remove deprecated Gtk.IconFactory + * Add missing keyboard shortcut for setting the background + * Move some dialogs to GtkTemplate, preparing for issues with valac master + * Fix context-sensitive label of background menu + * Fix context-sensitive label of Undo and Redo menu + * Fix context menu on import page + + -- Jens Georg Mon, 12 Dec 2016 18:18:45 +0100 + +shotwell (0.25.1-0~jensge1~xenial1) xenial; urgency=medium + + * Remove deprecated libsoup API + * Remove extra box around WebKit authenticator view + * Tumblr: Fix compile error with recent vala compiler + * Thumbnailer: Fix an issue with accidental closing of file descriptors + * Distribute misc.vapi + * Use proper ngettext for plurals instead of hard-coded >1 + * Fix issue with unique index on MD5 and Format + * Update Piwigo dialogs + * Remove most of the deprecated API calls for GTK+ <= 3.14 + * Remove some useless warnings generated by Vala + * Refactor Plugins to use a common aproach to load panes from glade + * Piwigo: Simplify category parsing + * Remove GtkUIManager and Gtk*Action* from code + * Fix a crash when clicking on tool window under Wayland + * Translation updates + + -- Jens Georg Mon, 21 Nov 2016 20:28:43 +0100 + +shotwell (0.25.0-0~jensge1~xenial1) xenial; urgency=medium + + * Add contrast to improvements + * Add a log when shifting events + * Add a debug output of the current timezone + * Fix compilation with recent Vala compiler + * Fix focus handling of full-screen viewer + * Remove obsolete CSS style property + * Support ACDSEE tags + * Use unicode characters + * Remove deprecated calls + * Silence two C warnings that are usually caused by valac + * Refactor web authenticator + * Spelling fixes + * Piwigo: Add option to override SSL certificate handling + * Piwigo: Add option to show the SSL certificate + * Remove an old GTK+ work-around + * Remove deprecated GSettings calls + * Persist export dialog settings + * Remove deprecated elements from export dialog + * Port web plugins to new libsoup API + * Fix libraw binding + * Piwigo: Fix new album creation + * Blacklist vaapi decoder to prevent crashes in video meta data extraction + * Hide "Folder" side-bar when empty + * Enable SQL debugging through environment variable + + + -- Jens Georg Mon, 24 Oct 2016 20:07:30 +0200 + +shotwell (0.23.7-1~jensge1~xenial1) xenial; urgency=medium + + * Language updates + + -- Jens Georg Mon, 12 Sep 2016 20:10:26 +0200 + +shotwell (0.23.6-1~jensge1~xenial1) xenial; urgency=medium + + * Fix locale-dependent times + * Use nl_langinfo instead of custom LConv + * Fix renaming of tags and saved searches + * Improve message shown on empty camera + * Make thm a recognized extension for JPEG files + + -- Jens Georg Mon, 29 Aug 2016 21:26:10 +0200 + +shotwell (0.23.5-1~jensge1~xenial2) xenial; urgency=medium + + * Plugins: Load icons and GtkBuilder files from GResource + * Offer a way to hide the bottom toolbar + * Fix .desktop file generation + * Use Gtk.MessageDialog's printf-style API for strings + * Add SQL indexes to PhotoTable + * Add Language headers to po files + * Update INSTALL file + * Really remove reference to external hmac_sha1 + * Disambiguate strings for time ranges + * Implement linked tags + * Make it more clear that something failed if SSL conncetion was not + possible + * Add option to filter by saved search + * Explicitly link plugins to their dependencies + * Fix typo in GSettings schema + * Re-add --disable-extra-plugins configure option + * Fix settings migrator and thumbnailer path + * Bump debian compat for proper --libexecdir parameter + + -- Jens Georg Tue, 16 Aug 2016 12:57:15 +0200 + +shotwell (0.23.4-1~jensge1~xenial1) xenial; urgency=medium + + * libraw: Fix binding of ProcessedImage.data + * graw: Prevent needless array duplication + * Fix screenshot URLs in appdata + * db: Add option to trace SQL statements + * Change build system to autotools + * Add help, appdata, gsettings and desktop files to translation system + * Change way help is built and installed + * Always install the manpage + * Several translation fixes + * Make message more clear that there are no photos matching a filter + + -- Jens Georg Sun, 24 Jul 2016 18:43:30 +0200 + +shotwell (0.23.2-1~jensge2~xenial1) xenial; urgency=medium + + * Use yelp-build to generate HTML docs + * Remove gphoto-2.4 support + * Fix background color drawing (#766864) + * Port GtkNotebook to GtkStack (#744289) + * Fix missing scroll bars in events (#766864) + * Fix URLs in manpage + * Clean up external functions + * Port librest's internal hmac_sha1 implementation to Vala + * Fix multiplication of symbols in plugins + * Request "popup" login in Facebook + * Update help regarding publishing permissions in Facebook (#766919) + * Add source SVG for new app icons + * Update logo for help + * Remove executable flag on images + * Piwigo: Let libsoup parse the cookie + * Remove string utility functions in publishing plugins + * Remove a libgee work-around, bump to 0.10 minimum version + * Make filter toolbar buttons contain text and image + * Move commonly used functions into shared library to prevent multiple + definition of symbols + + -- Jens Georg Mon, 04 Jul 2016 22:06:16 +0200 + +shotwell (0.23.1-1~jensge2~xenial1) xenial; urgency=medium + + * Update Facebook application id. Facebook integration works again (#748991) + * Remove obsolete VAPIs + * Remove custom WEXITSTATUS implementation + * Fix an assert in file monitor caused by renaming a file (#759403) + * Rename "Yorba website" to "Shotwell website" in About dialog so it + actually says what it does. + * Change the way how shotwell checks whether it runs uninstalled to allow + running with symlinks (#747374) + * Copyright was transferred from Yorba to SFC + * Do not block closing the viewer if there was an issue loading the photo + (#740436) + * Remove remaining references to .gnome2 directory (#766339) + * Update icons to hires versions and add a symbolic one (#717326) + * If we can't find any pixbuf representation of the Photo, push an empty + pixmap to force the display of the error message (#766338) + * Fix a critical when get_metadata returns null + * Remove deprecated calls to gtk_widget_render_icon() (#719188) + * Panic out if we cannot open the file in the viewer + * Make toolbar use GtkOverlay instead of implementing a custom pop-up to + prevent all kinds of issues with overlaying other applications or + toolboxes (#756126) + * Remove criticals caused by mouse hiding algorithm + + -- Jens Georg Mon, 23 May 2016 21:04:00 +0200 + +shotwell (0.23.0-1~xenial1) xenial; urgency=medium + + * Allow thinner minimum sidebar (#718611) + * Check .cache directory for read/write permissions (#737747) + * Fix crash during metadata update (#739917) + * Fixed Crop Ribbon / Control not visible (#747201) + * Port to webkit2gtk-4.0 (#751709) + * Have all soup sessions validate TLS certificates + * Remove shell magic from Makefile + * Remove calls to Posix.system() + * Documentation fixes and improvements (#764800) + * Fix CSS issue introduced with previous CSS improvements (#747637) + * Don't use GtkHeaderBar on dialogs if the gtk-dialogs-use-header setting is + not set (#749874) + * Use proper umask to create XDG_USER_CACHE and XDG_USER_DATA when they not + exist (#765182) + * Don't build the plugin twice + * Call pkg-config only once, not every compiler call + * Fix parallel builds not to build plugins several times over + * Fix contradicting license in rejected.svg (#757643) + + -- Jens Georg Tue, 26 Apr 2016 18:50:55 +0200 + +shotwell (0.22.0-1~vivid1) vivid; urgency=low + + * Improved metadata support for Facebook upload (#742163) + * Saved search now properly supports text is-set, not-set (#743924, #743923) + * Import title, exposure time when available + * User interface improvements (#744291, #719284, more) + * Sort photos by filename (#717878) + * Updated translations + + -- Jim Nelson Mon, 02 Feb 2015 18:24:34 -0800 + + +shotwell (0.21.0-1~utopic1) utopic; urgency=low + + * User interface refresh (#742326, #742443) + * Fix Shotwell Viewer .desktop file (#743799) + * Natural sorting of photo titles (#717960) + * Improved video thumbnailer (#739396, #741821) + * Updated translations + + -- Jim Nelson Mon, 02 Feb 2015 18:24:34 -0800 + + +shotwell (0.20.2-1~trusty2) trusty; urgency=low + + * Mark as Conflicts/Replaces Ubuntu's shotwell-common package (#724080) + + -- Jim Nelson Thu, 13 Nov 2014 19:12:06 -0800 + + +shotwell (0.20.2-1~trusty1) trusty; urgency=low + + * Set Desktop Slideshow dialog resource now included in distribution (#739095) + * Check for rendering failure in video thumbnailer (#738245) + * Updated translations + + -- Jim Nelson Fri, 31 Oct 2014 14:30:15 -0700 + + +shotwell (0.20.1-1~utopic1) utopic; urgency=low + + * Corrects problems with navigating photos in full-screen mode (#737092) + * Better memory utilization via more conservative pixbuf cache (#715198) + * Fixes minor bugs detected by better Vala code analysis + + -- Jim Nelson Thu, 02 Oct 2014 13:08:22 -0700 + + +shotwell (0.20.0-1~trusty1) trusty; urgency=low + + * Fix crash when deleting a photo in Shotwell Photo Viewer + * Fix crash when deleting a photo + * Better detection of corrupt files while importing + * Updated translations + + -- Jim Nelson Tue, 16 Sep 2014 15:36:44 -0700 + + +shotwell (0.19.0-1~saucy1) saucy; urgency=low + + * Support for Rajce.net and Gallery 3 photo services added + * Set background image for lock screen + * Better detection of corrupt images during import + * Various bug fixes + * Updated translations + + -- Jim Nelson Thu, 21 Aug 2014 13:59:52 -0700 + + +shotwell (0.18.1-1~saucy1) saucy; urgency=low + + * Fix Flickr publishing errors due to Flickr moving to HTTPs-only + * Fix crash when updating photo data/time + * Fix crash due to nested tag and changing sidebar selection + * Corrected URLs to point to new gnome.org pages + + -- Jim Nelson Mon, 30 Jun 2014 15:11:13 -0700 + + +shotwell (0.18.0-1~saucy1) saucy; urgency=low + + * Tumblr publishing fixed + * UNIX pipe unnecessarily left open for each imported video + * Improved searching for event comments and diacritics + * Bug fixes + * Compile and install translated help files + * Updated translations + + -- Jim Nelson Mon, 17 Mar 2014 15:56:49 -0700 + + +shotwell (0.15.1-1~raring1) raring; urgency=low + + * Install Tumblr plugin resources + * Fix crash when video thumbnails are being inspected and created + + -- Jim Nelson Tue, 19 Nov 2013 16:28:43 -0800 + + +shotwell (0.15.0-2~raring1) raring; urgency=low + + * Update to latest gexiv2 + + -- Charles Lindsay Fri, 04 Oct 2013 12:51:06 -0700 + +shotwell (0.15.0-1~raring2) raring; urgency=low + + * Copy and paste color adjustments between photos + * Highlights detail adjustment + * YouTube plugin now uses OAuth / OpenID + * Videos in Missing Files now re-import properly + * Improvements when thumbnailing videos + * Numerous bug fixes + + -- Jim Nelson Thu, 03 Oct 2013 16:33:28 -0700 + + +shotwell (0.14.1-1~quantal1) quantal; urgency=low + + * Fixes a critical issue where Shotwell could + close unexpectedly when working with RAW photos + in direct-edit mode + * The Facebook Connector now recovers smoothly + from type 7 errors + * EXIF-oriented photos uploaded to Facebook now + appear in their correct orientation, even when + the strip metadata option is turned on + * Fixes an issue where incorrect view filter + settings were applied on tag and event pages + * The Camera Developer is now disabled for RAW + images that lack a suitable paired or embedded + JPEG preview + * Updated translations for many languages, + including an updated Catalan translation that + corrects a problem where incorrect event dates + were displayed + * Assorted other bug fixes + + -- Lucas Beeler Wed, 3 Apr 2013 10:59:20 -0700 + + +shotwell (0.14.0-1~quantal1) quantal; urgency=low + + * A folder tree in the sidebar provides a directory- + hierarchy view of your Shotwell library. + * Dramatically improved user experience for RAW + photographers: long-standing bugs involving RAW + developer switching have been fixed. + * Comprehensive logging of photo and video import, + including the ability to save an import log file + to disk. The log tracks which files were detected + as duplicates as well as files that couldn't be + imported due to disk or camera problems. + * The Facebook Connector now uses the Facebook + Graph API, resulting in a smoother, more stable + experience uploading photos and videos to Facebook. + As a bonus, Shotwell photo titles now appear as + Facebook photo captions! + * The Shotwell video subsystem now relies on + GStreamer 1.0, making for easier, more stable video + import, better video thumbnails, and better handling + of video metadata. + * New slideshow effects, improved Piwigo support, + the ability to show and hide the main Shotwell sidebar, + and numerous bug fixes and translation updates! + + -- Lucas Beeler Mon, 18 Mar 2013 12:15:51 -0700 + + +shotwell (0.14.0pr1-1~precise1) precise; urgency=low + + * 0.14.0 pre-release + + -- Jim Nelson Wed, 06 Mar 2013 12:27:58 -0800 + + +shotwell (0.13.1-1~precise1) precise; urgency=low + + * Fixes an issue in which Shotwell would crash after deleting + all photos present in a view + * Fixes an issue where Shotwell would not include all + selected photos during a Nautilus "Send To..." export + operation + * Corrects a problem in which the file chooser dialog + used to select Shotwell's library location would + inappropriately select the parent directory of the chosen + directory + * Shotwell now properly inhibits the system screensaver when + playing a slideshow + * Fixes an issue in which the search filter bar could become + invisible even though a filter was being applied + * A progress bar now correctly appears during long batch + rotate and auto-enhance operations + * Shotwell no longer crashes when certain kinds of malformed + responses are received from remote servers during photo + publishing + * Corrected translation and desktop integration errors + + -- Lucas Beeler Fri, 5 Oct 2012 11:09:17 -0700 + + +shotwell (0.13.0-1~precise1) precise; urgency=low + + * The Shotwell Extras plugins now include support for + publishing photos to Tumblr + * Shotwell correctly handles dates before 1969 + * Shotwell lets you remove sensitive information from photos + before publishing them to social media sites + * Shotwell regenerates thumbnails automatically, making + migrating libraries between computers easier + * The Picasa connector now uses OAuth authentication for + enhanced security + * Bug fixes and translation updates + + -- Lucas Beeler Wed, 19 Sep 2012 16:08:22 -0700 + + +shotwell (0.12.3-1~oneiric1) oneiric; urgency=low + + * Corrects an issue where tags could be inappropriately removed from a + library. + * Enhances support for AVCHD-capable cameras. + * Prevents a soft lockup that could occur when certain very dark images + were autoenhanced. + * Corrects an issue where pressing the zoom hotkeys in certain parts + of the application could cause a crash. + + -- Clint Rogers Wed, 9 May 2012 11:22:00 -0700 + + +shotwell (0.12.2-1~oneiric1) oneiric; urgency=low + + * Corrects an issue where graphical corruption of the UI could + occur if the user navigated away from a camera page while camera + previews were being generated. + * Adds enhanced support for the Unity desktop environment. + * Clarified several strings. + * The application now recovers gracefully from corrupted tag data. + + -- Clint Rogers Tue, 11 Apr 2012 11:22:00 -0700 + + +shotwell (0.12.1-2~oneiric1) oneiric; urgency=low + + * Rebuild 0.12.1 for Oneiric with updated gexiv2. + + -- Adam Dingle Sat, 31 Mar 2012 12:56:39 -0700 + + +shotwell (0.12.1-1~oneiric1) oneiric; urgency=low + + * Corrects a critical issue where the application could + not be started in direct-edit mode. + + -- Clint Rogers Tue, 28 Mar 2012 12:18:54 -0700 + + +shotwell (0.12.0+trunk-1~oneiric1) oneiric; urgency=low + + * Adds straighten tool + * Ported from GTK 2 to GTK 3 + * Better handling of importing from Android devices + * Facebook and Flickr login now use OAuth authentication + * Numerous enhancements to the plugin subsystem + * The F-Spot importer is now implemented as a plugin + * Many, many bugfixes and stability enhancements + + -- Clint Rogers Tue, 27 Mar 2012 12:18:54 -0700 + + +shotwell (0.11.6+trunk-1~oneiric1) oneiric; urgency=low + + * Fixes a critical bug in which adding or modifying + tags in the single-photo view could result in the + loss of tag data. + + -- Lucas Beeler Thu, 3 Nov 2011 14:57:12 -0800 + + +shotwell (0.11.5+trunk-1~oneiric) oneiric; urgency=low + + * Trunk build for Oneiric. + + -- Eric Gregory Mon, 24 Oct 2011 11:38:45 -0700 + + +shotwell (0.11.5-1~natty1) natty; urgency=low + + * Fixes a collection concurrent access issue that could cause + Shotwell to crash during F-Spot import for users still + affected by this issue even after installing the Shotwell + 0.11.4 update. + + -- Lucas Beeler Tue, 18 Oct 2011 12:02:25 -0800 + + +shotwell (0.11.4-1~natty1) natty; urgency=low + + * Fixes two collection concurrent access issues that could cause + Shotwell to crash during F-Spot import. + + -- Lucas Beeler Tue, 13 Oct 2011 13:43:11 -0800 + + +shotwell (0.11.3-1~natty1) natty; urgency=low + + * Fixes a critical issue where Shotwell could crash immediately + following a photo import + * Fixes a critical issue where Shotwell could crash if the user + entered a tag name containing a slash ("/") character + * Long error messages in the Publishing dialog box are now wrapped + correctly + + -- Lucas Beeler Tue, 11 Oct 2011 14:20:00 -0800 + + +shotwell (0.11.2-1~natty1) natty; urgency=low + + * Increases stability working with hierarchical tags + * Importing hierarchical tags from F-Spot now works properly + * Fixes "server redirect contained no session key" errors in + the Facebook Connector + * Corrects problems with item counts over mixed media + * Various small fixes and enhancements + + -- Lucas Beeler Tue, 20 Sep 2011 15:00:00 -0800 + + +shotwell (0.11.1-1~natty1) natty; urgency=low + + * RAW+JPEG pairing now works on file import + * Startup crashes fixed + * Hierarchical tag issues resolved + * RAW developer bugs fixed + * Resolved internationalization problems + * Various small fixes and enhancements + + -- Eric Gregory Thu, 8 Sep 2011 13:00:00 -0800 + + +shotwell (0.11.0-1~natty1) natty; urgency=low + + * Hierarchical tags + * Support for RAW+JPEG and selectable RAW developer + * Switched from GConf to GSettings + * "Hide Photos Already Imported" is now persistent + * New Saved Search options + * Mimics no longer stored in home directory + * Added support for BMP format + * Many, many bugfixes + + -- Eric Gregory Tue, 23 Aug 2011 13:00:00 -0800 + + +shotwell (0.10.1-1~natty1) natty; urgency=low + + * Fixes "Hide Photos Already Imported" + * Multiple editing bugs fixed + * Resolves crash when two or more cameras have the same name + * Documentation now includes saved searches + * Piwigo bugs fixed + * Translation updates + + -- Eric Gregory Fri, 3 Jun 2011 13:00:00 -0800 + + +shotwell (0.10.0-1~natty1) natty; urgency=low + + * Dynamic view of photo library through saved search feature + * Automatic database backup + * Adjust date/time for videos + * Added Valadate testing framework + * Shotwell video thumbnailer eliminates Totem dependency + * Crop tool is now more flexible + * Filenames no longer used as titles on Facebook and Picasa uploads + * Translation corrections + * Many bug fixes + + -- Eric Gregory Thu, 26 May 2011 13:00:00 -0800 + + +shotwell (0.9.3-1~maverick1) maverick; urgency=low + + * Resolves issue where setting the desktop background didn't work in Gnome3 + * Mimics are now deleted when a RAW photo is removed + * Event dates are now only shown once in the Event view + * Fixes a number of translation issues + + -- Eric Gregory Wed, 21 Apr 2011 15:00:00 -0800 + + +shotwell (0.9.2-1~maverick1) maverick; urgency=low + + * Resolves translation issue where shotwell.mo is installed in wrong location + * Fixes issue where cancelling Flickr upload can crash Shotwell + * Fixes issue where creating a Picasa Web album with an ampersand in the name + crashes Shotwell + * Resolves bug where selecting "Publish" in single photo mode publishes the + entire library instead of the selected photo + * Async I/O in publishing operations is now stopped when the user cancels the + operation + * Issue fixed on Fedora where the text was cut off in publishing dialog + * Fixes issue with ratings filter where it didn't function when the search bar + was hidden + + -- Eric Gregory Mon, 11 Feb 2011 15:00:00 -0800 + + +shotwell (0.9.1-1~maverick1) maverick; urgency=low + + * Fixes many crashes and other issues in publishing plugins. + * Fixes issues where paths and filenames are not displayed correctly after a + failed import. + * Fixed issue where text search in event and camera import pages was a string + match instead of a keyword match. + * For enhanced compatibility with GNOME 3, the desktop name of the Shotwell + application has changed from "Shotwell Photo Manager" to simply "Shotwell". + * Shotwell now provides a configure script option to set the name of the system + library directory to either lib or lib64. + * Enhanced visibility of red-eye reticle. + * Fixed issue where the Adjust palette could be positioned partially off-screen + * Plugins now respect --debug switch in configure script. + * The event containing undated photos could be incorrectly labelled "(null)" in + the events directory page. + + -- Eric Gregory Mon, 4 Feb 2011 12:00:00 -0800 + + +shotwell (0.9.0-1~maverick1) maverick; urgency=low + + * New search bar can filter by media type, rating, and text matching. + (Titles, filename, tag and event names are searched.) + * TIFF support + * Extensible plugin framework for Web publishing and slideshow transitions. + * Print multiple photos, and multiple photos per page. + * Configurable user directory pattern during import. + * Edit multiple photo titles at once. + * Improved rendering of underexposed RAW photos. + * Various improvements and bug fixes. + + -- Eric Gregory Fri, 18 Mar 2011 18:14:31 -0800 + + +shotwell (0.8.1-1~maverick1) maverick; urgency=low + + * Fixes a problem where Shotwell could crash unexpectedly at + startup or when reading/writing metadata to files. + * Fixes a problem where Shotwell could hang when importing + voice-annotated videos. + * Fixes a problem where Shotwell failed to import date and time + information for some camera-generated MP4 videos. + * Shotwell can now delete video files from camera memory. + * Shotwell now supports the 3GP video format common on mobile + phones and RAW files with the SRW suffix generated by Samsung + cameras. + * Translation fixes and updates. + + -- Lucas Beeler Mon, 10 Jan 2011 15:07:31 -0800 + + +shotwell (0.8.0-1~maverick1) maverick; urgency=low + + * Video support for Ogg, AVI, MP4, Quicktime, and WMV files. + * Upload videos to major Web services, including YouTube, Facebook, Flickr, + and PicasaWeb. + * Runtime monitoring of library directory and auto-import of newly created + files. + * Background writing of metadata (tags, titles, rating, orientation, exposure + date) to master files (user configurable). + * Flagging of photos for batch operations. + * Set multiple photos to desktop background slideshow. + * Numerous translation updates. + * Various bug fixes. + + -- Jim Nelson Thu, 23 Dec 2010 12:22:14 -0800 + + +shotwell (0.7.2-1~lucid1) lucid; urgency=low + + * Fixed major startup problem when the user's Pictures directory is actually + a symbolic link. + * Fixed potential crasher when the user's Pictures directory contains a + large number of subdirectories. + * No longer asking if copying or linking if importing from Pictures directory + (which will always be linked). + * Fixed issue when logging in to PicasaWeb with a password with a '+' + character. + * Fixed update problem when using an external editor on a photo that was + edited externally in an earlier session. + * Various bug fixes. + * Numerous translation updates. + + -- Jim Nelson Fri, 10 Sep 2010 15:52:16 -0700 + + +shotwell (0.7.1-1~lucid1) lucid; urgency=low + + * Fixed a critical bug that caused Shotwell to crash when + deleting the only photo in an event + * F-Spot import now correctly interprets older databases + * Fixed an issue where pressing F11 would not exit full-screen + mode + * Translation updates for several languages + * Updated documentation + + -- Lucas Beeler Thu, 26 Aug 2010 12:32:09 -0700 + + +shotwell (0.7.0-1~lucid1) lucid; urgency=low + + * Migration support for F-Spot users: Shotwell can import + photos directly from your F-Spot library, preserving tags + and ratings + * Photos can be rated on a 1-5 star scale or marked as rejected. + A filter button supports viewing only photos of a specified + rating or better + * A new Last Import page in the sidebar gives you instant access + to your most recently imported photo roll + * Sidebar functionality and appearance have been improved with + new icons and inline renaming + * Shotwell scans your library files at startup, looking for + changes. Maintains library consistency when working with + photos in other applications + + -- Lucas Beeler Fri, 20 Aug 2010 13:40:54 -0700 + + +shotwell (0.6.1-1~lucid1) lucid; urgency=low + + * Added Lithuanian and Serbian translations, updated Italian + and Spanish translations + * Fixed a problem with reverting to the default library + directory + * Added more zooming shorcuts + * Shotwell no longer offers to delete photos that failed to + import from a camera + * Photos emptied from trash no longer reappear + + -- Allison Barlow Wed, 30 Jun 2010 09:31:31 -0700 + + +shotwell (0.6.0-1~lucid1) lucid; urgency=low + + * Basic support for RAW images, including import support for + all common formats like CR2 and DNG + * Full support for working with PNG images + * Users can now zoom into photos to reveal latent detail + * A new preferences dialog gives users exceptional control + over Shotwell's functionality and appearance + * Users can now open photos in an external editor, such as the + GIMP, from within Shotwell + * Photo tags and titles are imported automatically from XMP and + IPTC metadata + * A new photo trash can + + -- Lucas Beeler Mon, 28 Jun 2010 12:48:30 -0700 + + +shotwell (0.5.0-1~karmic3) karmic; urgency=low + + * Photos can be tagged and organized by tag, creating a new + tool for managing your photo collection + * Printing + * Photos can now be published to Google's Picasa Web Albums + service + * Photo exposure date and time can be set and shifted + * Photos can be set as your desktop background directly + from Shotwell + * Photo import runs in the background, making imports smoother + and more fluid + * Publishing photos to web services is more responsive + + -- Lucas Beeler Thu, 11 Mar 2010 13:36:24 -0800 + + +shotwell (0.4.3-1~karmic1) karmic; urgency=low + + * Updated Italian and French translations. + * Windows theme installed correctly. + * Problems unmounting camera fixed. + + -- Jim Nelson Mon, 18 Jan 2010 14:09:39 -0800 + + +shotwell (0.4.2-1~karmic1) karmic; urgency=low + + * Added Bulgarian, Portuguese, and Slovak translations. Updated + German translation. + * Windows installation fixed. + * Crash when deleting photos from camera fixed. + + -- Jim Nelson Mon, 04 Jan 2010 15:02:42 -0800 + + +shotwell (0.4.1-1~jaunty1) jaunty; urgency=low + + * Minor update adding a script missing in the 0.4.0 release. + + -- Adam Dingle Thu, 24 Dec 2009 08:07:04 -0500 + + +shotwell (0.4.0-1~jaunty1) jaunty; urgency=low + * Facebook and Flickr publishing. + * Events may now be split and merged. + * Alpha-release of Windows port now available. + * Undo/redo. + * Mark photos as favorite or hidden. View only favorites or show hidden + photos. + * Duplicate photos. + * Numerous bug fixes. + + -- Jim Nelson Wed, 23 Dec 2009 14:37:49 -0800 + + +shotwell (0.3.2-1~jaunty1) jaunty; urgency=low + + * Loosened photo pipeline assertion that checked for pixbuf scaling. + * Better error handling for situation where the HAL daemon (hald) is not + running or ready. + + -- Jim Nelson Wed, 11 Nov 2009 15:16:34 -0800 + + +shotwell (0.3.1-1~jaunty1) jaunty; urgency=low + + * Makefile changes to facilitate packaging. + * Warnings caught by Vala 0.7.8 corrected. + * Toolbar items now marked "important" where appropriate. + * Binary dependencies corrected in Debian packaging. + + -- Jim Nelson Mon, 09 Nov 2009 14:25:31 -0800 + + +shotwell (0.3.0-1~jaunty1) jaunty; urgency=low + + * Major update with numerous feature additions and performance and + scalability enhancements. + * Auto enhance button, shadows control, and histogram contrast expansion now + available. + * Hierarchical event tree in sidebar. Events can now be renamed. + * Background readahead to display full-window and fullscreen photos faster. + * Crop aspect ratios. + * Basic information pane to display photo title, exposure time, dimensions, + and file size. + * Configurable slideshow delay. + * Direct edit mode. Shotwell can open any JPEG file, move between other + JPEGS in the same directory, and edit them with the same tools available in + the photo manager. + * Better keyboard handling for selecting photos and moving between pages on + the sidebar. + * In camera view, option to hide photos already imported into Shotwell. + User now offered full report of imported photos and asked if they wish to + delete the photos from the camera. + * User-configurable items now stored persistently via GConf. + * Code internationalized. Partial French translation now available. + + -- Jim Nelson Mon, 02 Nov 2009 13:40:58 -0800 + + +shotwell (0.2.0-1~jaunty1) jaunty; urgency=low + + * Color histogram now available in adjustment tool. + * Drag-and-drop now supports the modifier keys for linking and asking + which operation to perform. + * Shotwell no longer uses a hardcoded directory for storing imported + photos. + * A nasty bug causing the X server to crash under compiz was fixed. + (#380) + * Support for libgee-0.3.0. + + -- Jim Nelson Wed, 05 Aug 2009 16:02:02 -0700 + + +shotwell (0.1.2-1) jaunty; urgency=low + + * Red-eye reduction feature now available. + * File/Import From Folder offers one more way to import photos into the + library. + * Color adjustment (exposure/saturation/tint/temperature) now available. + * Support for Vala 0.7.5. + + -- Jim Nelson Mon, 03 Aug 2009 11:27:11 -0700 + diff -Nru shotwell-0.28.4/dist/debian/compat shotwell-0.30.2/dist/debian/compat --- shotwell-0.28.4/dist/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/compat 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1 @@ +9 diff -Nru shotwell-0.28.4/dist/debian/control shotwell-0.30.2/dist/debian/control --- shotwell-0.28.4/dist/debian/control 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/control 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,67 @@ +Source: shotwell +Section: gnome +Priority: optional +Maintainer: Jens Georg +Build-Depends: debhelper (>= 9), + desktop-file-utils (>= 0.13), + libatk1.0-dev (>= 1.30.0), + libexif-dev (>= 0.6.16), + libgee-0.8-dev (>= 0.8.5), + libgexiv2-dev (>= 0.10.4), + libexiv2-dev, + libglib2.0-dev (>= 2.30.0), + libgphoto2-dev (>= 2.5.0), + libgstreamer1.0-dev (>= 1.0.0), + libgstreamer-plugins-base1.0-dev (>= 1.0.0), + libgtk-3-dev (>= 3.12.2), + libgudev-1.0-dev (>= 145), + libjson-glib-dev (>= 0.10.0), + libraw-dev (>= 0.13.2), + libsoup2.4-dev (>= 2.26.0), + libsqlite3-dev (>= 3.5.9), + libunity-dev (>= 5.10.0), + libwebkit2gtk-4.0-dev, + libxml2 (>= 2.6.32), + m4 (>= 1.4.13), + valac (>= 0.20.1), + gnome-doc-utils, + yelp-tools, + appstream-util, + gettext ( >= 0.19.8), + libgcr-3-dev ( >= 3.18), + libgdata-dev, + meson, + ninja-build, + gnome-pkg-tools +Standards-Version: 3.9.8 +Homepage: https://wiki.gnome.org/Apps/Shotwell/ + +Package: shotwell +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, librsvg2-common, dbus-x11, dconf-tools +Recommends: desktop-file-utils +Conflicts: shotwell-common +Replaces: shotwell-common +Description: Digital photo manager + Shotwell is a digital photo manager designed for the GNOME desktop + environment. It allows you to import photos from disk or camera, organize + them in various ways, view them in full-window or fullscreen mode, and + export and share them with others by publishing them to popular web + services. + . + Visit https://wiki.gnome.org/Apps/Shotwell to read about the current state of + Shotwell's development. + +Package: shotwell-dbg +Section: debug +Architecture: any +Depends: shotwell (= ${binary:Version}), ${misc:Depends} +Description: Digital photo manager + Shotwell is a digital photo manager designed for the GNOME desktop + environment. It allows you to import photos from disk or camera, organize + them in various ways, view them in full-window or fullscreen mode, and + export and share them with others by publishing them to popular web + services. + . + Visit https://wiki.gnome.org/Apps/Shotwell to read about the current state of + Shotwell's development. diff -Nru shotwell-0.28.4/dist/debian/copyright shotwell-0.30.2/dist/debian/copyright --- shotwell-0.28.4/dist/debian/copyright 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/copyright 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,26 @@ +This package was debianized by Jim Nelson on +Wed, 23 Dec 2009 14:47:44 -0800. + +It was downloaded from http://yorba.org/download/shotwell/ + +Upstream Author: + + Jim Nelson + +Copyright: + + Copyright 2016 Software Freedom Conservancy Inc. + +License: + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + On Debian systems, the complete text of the GNU Lesser General Public + License 2.1, can be found in /usr/share/common-licenses/LGPL-2.1. + +The Debian packaging is copyright 2016 Software Freedom Conservancy Inc. and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + diff -Nru shotwell-0.28.4/dist/debian/dirs shotwell-0.30.2/dist/debian/dirs --- shotwell-0.28.4/dist/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/dirs 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,6 @@ +/usr +/usr/bin +/usr/lib/shotwell/plugins/builtin +/usr/share/applications +/usr/share/locale-langpack +/usr/share/gnome/help/shotwell diff -Nru shotwell-0.28.4/dist/debian/docs shotwell-0.30.2/dist/debian/docs --- shotwell-0.28.4/dist/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/docs 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,3 @@ +NEWS +README +THANKS diff -Nru shotwell-0.28.4/dist/debian/menu shotwell-0.30.2/dist/debian/menu --- shotwell-0.28.4/dist/debian/menu 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/menu 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,2 @@ +?package(shotwell):needs="X11" section="Applications/Viewers"\ + title="Shotwell" command="/usr/bin/shotwell" diff -Nru shotwell-0.28.4/dist/debian/rules shotwell-0.30.2/dist/debian/rules --- shotwell-0.28.4/dist/debian/rules 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/rules 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --parallel --with gnome --buildsystem=meson + +override_dh_auto_configure: + dh_auto_configure -- \ + --libexec=/usr/lib \ + -Dunity-support=true \ + -Dinstall-apport-hook=true + +override_dh_gnome_clean: + dh_gnome_clean --no-control + diff -Nru shotwell-0.28.4/dist/debian/shotwell.install shotwell-0.30.2/dist/debian/shotwell.install --- shotwell-0.28.4/dist/debian/shotwell.install 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/shotwell.install 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,3 @@ +usr/bin +usr/lib +usr/share diff -Nru shotwell-0.28.4/dist/debian/watch shotwell-0.30.2/dist/debian/watch --- shotwell-0.28.4/dist/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.30.2/dist/debian/watch 2019-02-07 16:00:50.000000000 +0000 @@ -0,0 +1,3 @@ +# watch control file for uscan +version=3 +http://yorba.org/download/shotwell/([\d\.]+)/shotwell-(.*)\.tar\.gz