From a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:50:51 +0200 Subject: New upstream release --- debian/patches/0100-ios8.patch | 10 +++++----- debian/patches/series | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'debian/patches') diff --git a/debian/patches/0100-ios8.patch b/debian/patches/0100-ios8.patch index a87e3c5..8844861 100644 --- a/debian/patches/0100-ios8.patch +++ b/debian/patches/0100-ios8.patch @@ -9,7 +9,7 @@ Index: trunk/src/camera/ImportPage.vala =================================================================== --- trunk.orig/src/camera/ImportPage.vala +++ trunk/src/camera/ImportPage.vala -@@ -765,6 +765,15 @@ public class ImportPage : CheckerboardPa +@@ -773,6 +773,15 @@ public class ImportPage : CheckerboardPa ~ImportPage() { LibraryPhoto.global.contents_altered.disconnect(on_media_added_removed); Video.global.contents_altered.disconnect(on_media_added_removed); @@ -25,7 +25,7 @@ Index: trunk/src/camera/ImportPage.vala } public override Gtk.Toolbar get_toolbar() { -@@ -1140,11 +1149,14 @@ public class ImportPage : CheckerboardPa +@@ -1162,11 +1171,14 @@ public class ImportPage : CheckerboardPa update_status(busy, false); refresh_error = null; @@ -45,7 +45,7 @@ Index: trunk/src/camera/ImportPage.vala } update_status(true, refreshed); -@@ -1249,13 +1261,15 @@ public class ImportPage : CheckerboardPa +@@ -1271,13 +1283,15 @@ public class ImportPage : CheckerboardPa progress_bar.set_ellipsize(Pango.EllipsizeMode.NONE); progress_bar.set_text(""); progress_bar.set_fraction(0.0); @@ -63,7 +63,7 @@ Index: trunk/src/camera/ImportPage.vala if (refresh_result == GPhoto.Result.OK) { if (import_sources.get_count () == 0) { this.set_page_message (this.get_view_empty_message ()); -@@ -1624,11 +1638,15 @@ public class ImportPage : CheckerboardPa +@@ -1646,11 +1660,15 @@ public class ImportPage : CheckerboardPa } private void import(Gee.Iterable items) { @@ -84,7 +84,7 @@ Index: trunk/src/camera/ImportPage.vala } update_status(true, refreshed); -@@ -1764,12 +1782,15 @@ public class ImportPage : CheckerboardPa +@@ -1786,12 +1804,15 @@ public class ImportPage : CheckerboardPa } private void close_import() { diff --git a/debian/patches/series b/debian/patches/series index 2962406..ab17c96 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,7 @@ #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 +#0600-remove_wrong_marco.patch 0100-ios8.patch #0510-Delay_size_request.patch #0515-Fix_background_color_drawing.patch -- cgit v1.2.3