New upstream release

3 files changed, 26 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 201eece..b2f8cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+shotwell (0.26.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 22 Mar 2017 06:51:19 +0100
+
+shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium
+
+  * Revert to last stable release 0.24.5 (Closes: #850149).
+    (Necessary, since unblock request #854912 for 0.25.4-0.1 was turned down.)
+
+ -- Richard B. Kreckel <kreckel@debian.org>  Tue, 14 Feb 2017 18:47:24 +0100
+
+shotwell (0.25.4-0.1) unstable; urgency=medium
+
+  * New upstream release.
+    - Many UI fixes (Closes: #849688).
+
+ -- Richard B. Kreckel <kreckel@debian.org>  Sun, 05 Jan 2017 18:43:12 +0100
+
 shotwell (0.25.4-1) unstable; urgency=medium
 
   * New upstream release (Closes: #849688, #851711).
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<DataObject> 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