[SCM] FreeCAD packaging branch, master, updated. debian/0.12.5284-dfsg-4-11-ga947419

[Anton Gladky]

The following commit has been merged in the master branch:
commit 1af4c8a74e43b6c55390650494a2ca3eca567ae9
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Mar 19 18:50:51 2012 +0100

    Fix crash in Help->About menu. (Closes: #663704)

diff --git a/debian/patches/fix_crash_in_help_menu.patch b/debian/patches/fix_crash_in_help_menu.patch
new file mode 100644
index 0000000..210e6a8
--- /dev/null
+++ b/debian/patches/fix_crash_in_help_menu.patch
@@ -0,0 +1,36 @@
+Description: fix crash in Help->About menu
+Bug-Debian: http://bugs.debian.org/663704
+Author: Werner Mayer <werner.wm.mayer at gmx.de>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Applied-Upstream: http://free-cad.git.sourceforge.net/git/gitweb.cgi?p=free-cad/free-cad;a=commitdiff;h=04cdad1db4227bc52cda1b71eefd1ed85e8e9e75#patch1
+Last-Update: 2012-03-19
+
+--- a/src/Gui/CommandStd.cpp
++++ b/src/Gui/CommandStd.cpp
+@@ -33,6 +33,8 @@
+ #endif
+ #endif
+ 
++#include <boost/scoped_ptr.hpp>
++
+ #include <Base/Exception.h>
+ #include <Base/FileInfo.h>
+ #include <Base/Interpreter.h>
+@@ -125,7 +127,7 @@
+     applyCommandData(pcAction);
+     if (sPixmap)
+         pcAction->setIcon(Gui::BitmapFactory().pixmap(sPixmap));
+-      pcAction->setShortcut(QString::fromAscii(sAccel));
++        pcAction->setShortcut(QString::fromAscii(sAccel));
+ 
+     return pcAction;
+ }
+@@ -226,7 +228,7 @@
+ void StdCmdAbout::activated(int iMsg)
+ {
+     const Gui::Dialog::AboutDialogFactory* f = Gui::Dialog::AboutDialogFactory::defaultFactory();
+-    QSharedPointer <QDialog> dlg(f->create(getMainWindow()));
++    boost::scoped_ptr<QDialog> dlg(f->create(getMainWindow()));
+     dlg->exec();
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0a50ba3..6a0a58b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix_crash_in_help_menu.patch
 disable_memory_check.patch
 fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch

-- 
FreeCAD packaging