Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package hugin. This fixes another instance of the assertion bugs <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766093#50> which is a usability nuisance (repeated klick-through messages, see also 771225). unblock hugin/2014.0.0+dfsg-5 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-11-22 14:24:53.000000000 +0100
+++ hugin-2014.0.0+dfsg/debian/changelog 2015-03-04 18:59:12.000000000 +0100
@@ -1,3 +1,17 @@
+hugin (2014.0.0+dfsg-5) unstable; urgency=medium
+
+ * Upload to unstable.
+
+ -- Andreas Metzler <ametzler@debian.org> Wed, 04 Mar 2015 18:59:08 +0100
+
+hugin (2014.0.0+dfsg-4) experimental; urgency=medium
+
+ * 56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff,
+ 57_6852_0443fd122958_Check_date_before_formatting.diff: Pull two more
+ assertion fixes.
+
+ -- Andreas Metzler <ametzler@debian.org> Mon, 02 Mar 2015 19:41:52 +0100
+
hugin (2014.0.0+dfsg-3) unstable; urgency=medium
* 55_6510_dc996061de70_Fixes_one_format_string.diff: Another assertion fix
diff -Nru hugin-2014.0.0+dfsg/debian/patches/56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff hugin-2014.0.0+dfsg/debian/patches/56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff
--- hugin-2014.0.0+dfsg/debian/patches/56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff 1970-01-01 01:00:00.000000000 +0100
+++ hugin-2014.0.0+dfsg/debian/patches/56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff 2015-03-04 18:58:38.000000000 +0100
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User tmodes
+# Date 1425205953 -3600
+# Sun Mar 01 11:32:33 2015 +0100
+# Node ID 768b9649a2436e35bca1ac6a5cbbf4fe0edd27d5
+# Parent 3afaaaff9287fe74f32ffff9f366547309f4704b
+Fixes 2 debug assert messages in about dialog [1426837]
+
+diff -r 3afaaaff9287 -r 768b9649a243 src/hugin1/hugin/AboutDialog.cpp
+--- a/src/hugin1/hugin/AboutDialog.cpp Sun Mar 01 10:13:05 2015 +0100
++++ b/src/hugin1/hugin/AboutDialog.cpp Sun Mar 01 11:32:33 2015 +0100
+@@ -111,7 +111,7 @@
+ GetSystemInformation(&font);
+
+ // the notebook
+- m_about_notebook = XRCCTRL(*this,"about_dlg",wxNotebook);
++ m_about_notebook = XRCCTRL(*this,"about_notebook", wxNotebook);
+ // the logo
+ m_logoImgCtrl = XRCCTRL(*this, "about_logo", wxStaticBitmap);
+
+@@ -145,7 +145,7 @@
+ text=text+wxT("\n")+wxString::Format(_("Architecture: %s"),is64.c_str());
+ // wxGetFreeMemory returns a wxMemorySize, which is undocumented.
+ // However, we know -1 is returned on failure, so it must be signed.
+- text=text+wxT("\n")+wxString::Format(_("Free memory: %ld kiB"),(long long) wxGetFreeMemory().GetValue()/1024);
++ text=text+wxT("\n")+wxString::Format(_("Free memory: %lld kiB"),(long long) wxGetFreeMemory().GetValue()/1024);
+ #ifdef _WINDOWS
+ UINT cp=GetACP();
+ text=text+wxT("\n")+wxString::Format(_("Active Codepage: %u"),cp);
diff -Nru hugin-2014.0.0+dfsg/debian/patches/57_6852_0443fd122958_Check_date_before_formatting.diff hugin-2014.0.0+dfsg/debian/patches/57_6852_0443fd122958_Check_date_before_formatting.diff
--- hugin-2014.0.0+dfsg/debian/patches/57_6852_0443fd122958_Check_date_before_formatting.diff 1970-01-01 01:00:00.000000000 +0100
+++ hugin-2014.0.0+dfsg/debian/patches/57_6852_0443fd122958_Check_date_before_formatting.diff 2015-03-04 18:58:38.000000000 +0100
@@ -0,0 +1,59 @@
+# HG changeset patch
+# User tmodes
+# Date 1425206092 -3600
+# Sun Mar 01 11:34:52 2015 +0100
+# Node ID 0443fd1229588f5f205d2c74337c6e5f17844a7e
+# Parent 768b9649a2436e35bca1ac6a5cbbf4fe0edd27d5
+Check date before formatting
+
+Should probably fix debug assertion [1426837]
+
+diff -r 768b9649a243 -r 0443fd122958 src/hugin1/ptbatcher/ProjectListBox.cpp
+--- a/src/hugin1/ptbatcher/ProjectListBox.cpp Sun Mar 01 11:32:33 2015 +0100
++++ b/src/hugin1/ptbatcher/ProjectListBox.cpp Sun Mar 01 11:34:52 2015 +0100
+@@ -303,19 +303,25 @@
+ return _("Assistant");
+ };
+ case 7:
+- return project->GetStatusText(); //all following cases default to an empty string if file is missing
++ return project->GetStatusText();
++ //all following cases default to an empty string if file is missing
+ case 3:
+ if(project->status!=Project::MISSING)
+ {
+- return project->modDate.FormatDate()+_T(", ")+project->modDate.FormatTime();
+- }
++ if (project->modDate.IsValid())
++ {
++ return project->modDate.Format();
++ };
++ };
++ return wxEmptyString;
+ case 4:
+ if(project->status!=Project::MISSING)
+ {
+ str = GetLongerFormatName(project->options.outputImageType);
+ str = str+wxT(" (.")+wxString::FromAscii(project->options.outputImageType.c_str())+wxT(")");
+ return str;
+- }
++ };
++ return wxEmptyString;
+ case 5:
+ if(project->status!=Project::MISSING)
+ {
+@@ -330,6 +336,7 @@
+ return _T("");
+ }
+ };
++ return wxEmptyString;
+ case 6:
+ if(project->status!=Project::MISSING)
+ {
+@@ -338,6 +345,7 @@
+ str = str << project->options.getHeight();
+ return str;
+ }
++ return wxEmptyString;
+ default:
+ return _T("");
+ }
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-11-22 14:23:40.000000000 +0100
+++ hugin-2014.0.0+dfsg/debian/patches/series 2015-03-04 18:58:38.000000000 +0100
@@ -4,3 +4,5 @@
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
+56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff
+57_6852_0443fd122958_Check_date_before_formatting.diff
Attachment:
signature.asc
Description: Digital signature