[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771225: unblock: hugin/2014.0.0+dfsg-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package hugin. Compared to the version already in
jessie there is only a single string format fix to avoid an assert.
In certain hugin installations the now avoided assert caused a
very obnoxious klick-through assertion-warning dialogue. This is why I
want to see this fixed in jessie. It is a single-line change.

unblock hugin/2014.0.0+dfsg-3

thanks, cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru hugin-2014.0.0+dfsg/debian/changelog hugin-2014.0.0+dfsg/debian/changelog
--- hugin-2014.0.0+dfsg/debian/changelog	2014-10-26 08:11:12.000000000 +0100
+++ hugin-2014.0.0+dfsg/debian/changelog	2014-11-22 14:24:53.000000000 +0100
@@ -1,3 +1,11 @@
+hugin (2014.0.0+dfsg-3) unstable; urgency=medium
+
+  * 55_6510_dc996061de70_Fixes_one_format_string.diff: Another assertion fix
+    from upstream HG. See #766093.
+    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766093#33
+
+ -- Andreas Metzler <ametzler@debian.org>  Sat, 22 Nov 2014 14:23:45 +0100
+
 hugin (2014.0.0+dfsg-2) unstable; urgency=medium
 
   * 54_59938e35626e_Fixes_formating_of_2_strings.diff: Fix wxArgNormalizer
diff -Nru hugin-2014.0.0+dfsg/debian/patches/55_6510_dc996061de70_Fixes_one_format_string.diff hugin-2014.0.0+dfsg/debian/patches/55_6510_dc996061de70_Fixes_one_format_string.diff
--- hugin-2014.0.0+dfsg/debian/patches/55_6510_dc996061de70_Fixes_one_format_string.diff	1970-01-01 01:00:00.000000000 +0100
+++ hugin-2014.0.0+dfsg/debian/patches/55_6510_dc996061de70_Fixes_one_format_string.diff	2014-11-22 14:23:37.000000000 +0100
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User tmodes
+# Date 1391242867 -3600
+#      Sat Feb 01 09:21:07 2014 +0100
+# Branch hugin_parallel_openmp
+# Node ID dc996061de709f8fcfdd435e4841c48a9852a737
+# Parent  56059be698f512a01f48e88102f894c2463ae207
+Fixes one format string
+
+diff -r 56059be698f5 -r dc996061de70 src/hugin1/hugin/CPImageCtrl.cpp
+--- a/src/hugin1/hugin/CPImageCtrl.cpp	Fri Jan 24 18:27:52 2014 +0100
++++ b/src/hugin1/hugin/CPImageCtrl.cpp	Sat Feb 01 09:21:07 2014 +0100
+@@ -1027,7 +1027,7 @@
+ {
+     DisplayedControlPoint dcp(cp, this, mirrored);
+     dcp.SetColour(pointColors[m_points.size() % pointColors.size()], textColours[m_points.size() % textColours.size()]);
+-    dcp.SetLabel(wxString::Format(wxT("%d"), m_points.size()));
++    dcp.SetLabel(wxString::Format(wxT("%lu"), (unsigned long int)m_points.size()));
+     m_points.push_back(dcp);
+ }
+ 
diff -Nru hugin-2014.0.0+dfsg/debian/patches/series hugin-2014.0.0+dfsg/debian/patches/series
--- hugin-2014.0.0+dfsg/debian/patches/series	2014-10-26 07:29:04.000000000 +0100
+++ hugin-2014.0.0+dfsg/debian/patches/series	2014-11-22 14:23:40.000000000 +0100
@@ -3,3 +3,4 @@
 52_044b08eb6adf_Several_fixes_to_treelistctrl.diff
 53_f88dc95914ae_Use_correct_class_wxStaticBitmap_for_bitmap_controls.diff
 54_59938e35626e_Fixes_formating_of_2_strings.diff
+55_6510_dc996061de70_Fixes_one_format_string.diff

Attachment: signature.asc
Description: Digital signature


Reply to: