diff -Nru shotwell-0.12.3/debian/changelog shotwell-0.12.3/debian/changelog --- shotwell-0.12.3/debian/changelog 2012-08-05 14:54:36.000000000 +0200 +++ shotwell-0.12.3/debian/changelog 2013-10-06 11:55:10.000000000 +0200 @@ -1,3 +1,11 @@ +shotwell (0.12.3-2+deb7u1) stable; urgency=low + + * debian/patches/no_assertion.patch: + - Cherry-pick patch from upstream to fix crashes at startup by + Replaces an assertion with a short-circuit return (Closes: #722909). + + -- Luca Falavigna Sun, 06 Oct 2013 11:50:33 +0200 + shotwell (0.12.3-2) unstable; urgency=low * Team upload. diff -Nru shotwell-0.12.3/debian/patches/no_assertion.patch shotwell-0.12.3/debian/patches/no_assertion.patch --- shotwell-0.12.3/debian/patches/no_assertion.patch 1970-01-01 01:00:00.000000000 +0100 +++ shotwell-0.12.3/debian/patches/no_assertion.patch 2013-10-06 11:54:35.000000000 +0200 @@ -0,0 +1,32 @@ +Author: Lucas Beeler +Description: Replaces an assertion with a short-circuit return and a + debug message. +Origin: upstream, http://redmine.yorba.org/projects/shotwell/repository/revisions/18585950ca73cb21ee246cc608d3a193c4bbb085 +Bug: http://redmine.yorba.org/issues/5155 +Applied-Upstream: 0.14.0 +--- + src/DirectoryMonitor.vala | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/DirectoryMonitor.vala b/src/DirectoryMonitor.vala +index 8071afd..73c6a3d 100644 +--- a/src/DirectoryMonitor.vala ++++ b/src/DirectoryMonitor.vala +@@ -507,8 +507,12 @@ public class DirectoryMonitor : Object { + } + + protected virtual void internal_notify_file_discovered(File file, FileInfo info) { +- bool updated = files.update(file, info); +- assert(updated); ++ if (!files.update(file, info)) { ++ debug("DirectoryMonitor.internal_notify_file_discovered: %s discovered but not added to file map", ++ file.get_path()); ++ ++ return; ++ } + + notify_file_discovered(file, info); + } +-- +1.7.10.4 + diff -Nru shotwell-0.12.3/debian/patches/series shotwell-0.12.3/debian/patches/series --- shotwell-0.12.3/debian/patches/series 2012-07-22 11:35:17.000000000 +0200 +++ shotwell-0.12.3/debian/patches/series 2013-10-06 11:54:51.000000000 +0200 @@ -2,3 +2,4 @@ format_string.patch openmp.patch metadata.patch +no_assertion.patch