Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package hugin, this fixes two issues: * #822062, #855505: When a custom temp directory was sent in the preferences the hugin assistant failed when aligning pictures. * Bumped version number. The tarball is *binary* *identical* with rc2. 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-2016.2.0~rc2+dfsg/debian/changelog hugin-2016.2.0+dfsg/debian/changelog
--- hugin-2016.2.0~rc2+dfsg/debian/changelog 2016-09-11 13:40:11.000000000 +0200
+++ hugin-2016.2.0+dfsg/debian/changelog 2017-02-26 08:23:23.000000000 +0100
@@ -1,3 +1,14 @@
+hugin (2016.2.0+dfsg-1) unstable; urgency=medium
+
+ * rc2 released as 2016.2.0.
+ * Fix assissant align error with custom temporary directory
+ 50_67c64f0ca1c4_Fixes_a_type_of_format_string.diff
+ error.
+ 51_401823447b21_Fixes_running_assistant_with_user_defined_temp_directory.diff
+ Closes: #822062, #855505
+
+ -- Andreas Metzler <ametz...@debian.org> Sun, 26 Feb 2017 08:23:23 +0100
+
hugin (2016.2.0~rc2+dfsg-2) unstable; urgency=medium
* Upload to unstable.
diff -Nru hugin-2016.2.0~rc2+dfsg/debian/patches/50_67c64f0ca1c4_Fixes_a_type_of_format_string.diff hugin-2016.2.0+dfsg/debian/patches/50_67c64f0ca1c4_Fixes_a_type_of_format_string.diff
--- hugin-2016.2.0~rc2+dfsg/debian/patches/50_67c64f0ca1c4_Fixes_a_type_of_format_string.diff 1970-01-01 01:00:00.000000000 +0100
+++ hugin-2016.2.0+dfsg/debian/patches/50_67c64f0ca1c4_Fixes_a_type_of_format_string.diff 2016-12-18 15:05:14.000000000 +0100
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User tmodes
+# Date 1474121697 -7200
+# Sat Sep 17 16:14:57 2016 +0200
+# Node ID 67c64f0ca1c45c991efa7b11e457cc5bc2c945c0
+# Parent 91b78c0c991f60744d71c9a4bd434c46cba4b444
+Fixes a type of format string
+
+diff -r 91b78c0c991f -r 67c64f0ca1c4 src/hugin1/hugin/MainFrame.cpp
+--- a/src/hugin1/hugin/MainFrame.cpp Sat Sep 17 16:14:24 2016 +0200
++++ b/src/hugin1/hugin/MainFrame.cpp Sat Sep 17 16:14:57 2016 +0200
+@@ -2162,7 +2162,7 @@
+ unsigned i2 = *(comps[1].begin());
+ ShowCtrlPointEditor( i1, i2);
+ // display message box with
+- wxMessageBox(wxString::Format(_("Warning %d unconnected image groups found:"), comps.size()) + Components2Str(comps) + wxT("\n")
++ wxMessageBox(wxString::Format(_("Warning %d unconnected image groups found:"), static_cast<int>(comps.size())) + Components2Str(comps) + wxT("\n")
+ + _("Please create control points between unconnected images using the Control Points tab in the panorama editor.\n\nAfter adding the points, press the \"Align\" button again"),_("Error"), wxOK , mainWin);
+ return;
+ };
diff -Nru hugin-2016.2.0~rc2+dfsg/debian/patches/51_401823447b21_Fixes_running_assistant_with_user_defined_temp_directory.diff hugin-2016.2.0+dfsg/debian/patches/51_401823447b21_Fixes_running_assistant_with_user_defined_temp_directory.diff
--- hugin-2016.2.0~rc2+dfsg/debian/patches/51_401823447b21_Fixes_running_assistant_with_user_defined_temp_directory.diff 1970-01-01 01:00:00.000000000 +0100
+++ hugin-2016.2.0+dfsg/debian/patches/51_401823447b21_Fixes_running_assistant_with_user_defined_temp_directory.diff 2017-02-26 08:05:34.000000000 +0100
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User tmodes
+# Date 1488046377 -3600
+# Sat Feb 25 19:12:57 2017 +0100
+# Node ID 401823447b218b6d4778664fb6496deea6b03936
+# Parent 0fec458e26560958d657d14fd9a7a99b7f5c6c10
+Fixes running assistant with user defined temp directory [1666030]
+
+--- a/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp
++++ b/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp
+@@ -255,6 +255,9 @@ int MyExecPanel::ExecQueue(HuginQueue::C
+ #if wxCHECK_VERSION(3,0,0)
+ wxConfigBase* config = wxConfigBase::Get();
+ const long threads = config->Read(wxT("/output/NumberOfThreads"), 0l);
++ // read all current environment variables
++ wxGetEnvMap(&m_executeEnv.env);
++ // now modify some variables before passing them to wxExecute
+ if (threads > 0)
+ {
+ wxString s;
diff -Nru hugin-2016.2.0~rc2+dfsg/debian/patches/series hugin-2016.2.0+dfsg/debian/patches/series
--- hugin-2016.2.0~rc2+dfsg/debian/patches/series 2016-07-16 07:03:27.000000000 +0200
+++ hugin-2016.2.0+dfsg/debian/patches/series 2017-02-26 08:00:14.000000000 +0100
@@ -1 +1,3 @@
43_fallbackhelp.patch
+50_67c64f0ca1c4_Fixes_a_type_of_format_string.diff
+51_401823447b21_Fixes_running_assistant_with_user_defined_temp_directory.diff
signature.asc
Description: PGP signature
