summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:32:48 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:32:48 +0100
commit4fbd643a6d9b6a3d6142f0ded0988676b2aac861 (patch)
tree3fd58ae74d9757d760566408ef07833aa9738d57 /debian
parentccff5442184e84d511c2bd25ed3da53e4336a272 (diff)
New ustream release
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/0100-ios8.patch10
2 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 0bc9807..f7ff6c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,16 @@
-shotwell (0.25.0.1-1) unstable; urgency=medium
+shotwell (0.25.1-1) unstable; urgency=medium
* New upstream release.
- Fix uses 100% cpu for minutes at startup on a recent cpu
(Closes: #777499).
+ - Refresh debian/patches/0100-ios8.patch.
* debian/control:
- Add libgcr-3-dev to Build-Depends.
- Bump libgexiv2-dev B-D minimum version to 0.10.4.
- Bump libglib2.0-dev B-D minimum version to 2.40.
- Bump libgtk-3-dev B-D minimum version to 3.14.
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 09 Nov 2016 21:32:48 +0100
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 25 Nov 2016 04:24:55 +0100
shotwell (0.24.0-1) unstable; urgency=medium
diff --git a/debian/patches/0100-ios8.patch b/debian/patches/0100-ios8.patch
index aab9bab..a87e3c5 100644
--- a/debian/patches/0100-ios8.patch
+++ b/debian/patches/0100-ios8.patch
@@ -2,7 +2,7 @@ Description: Reset iOS 8 devices to download files
Origin: https://bugzilla.gnome.org/show_bug.cgi?id=742295#c22
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=742295
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792016
-Last-Update: 2016-02-22
+Last-Update: 2016-11-25
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/src/camera/ImportPage.vala
@@ -25,7 +25,7 @@ Index: trunk/src/camera/ImportPage.vala
}
public override Gtk.Toolbar get_toolbar() {
-@@ -1154,11 +1163,14 @@ public class ImportPage : CheckerboardPa
+@@ -1140,11 +1149,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);
-@@ -1263,13 +1275,15 @@ public class ImportPage : CheckerboardPa
+@@ -1249,13 +1261,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 ());
-@@ -1638,11 +1652,15 @@ public class ImportPage : CheckerboardPa
+@@ -1624,11 +1638,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);
-@@ -1778,12 +1796,15 @@ public class ImportPage : CheckerboardPa
+@@ -1764,12 +1782,15 @@ public class ImportPage : CheckerboardPa
}
private void close_import() {