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

merkaartor: please allow t-p-u upload



Hi Release Team!

Unfortunately we were hit by bug report about a crash in merkaartor[1], so I'd
like to ask for permission to upload a fix with the attached debdiff to t-p-u.

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508907

Hope that's ok!

Cheers,

Bernd

-- 
 Bernd Zeimetz                           Debian GNU/Linux Developer
 GPG Fingerprint: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
diff -Nru merkaartor-0.0.11~svn7913/debian/changelog merkaartor-0.0.11~svn7913+lenny/debian/changelog
--- merkaartor-0.0.11~svn7913/debian/changelog	2008-08-23 13:46:49.000000000 +0200
+++ merkaartor-0.0.11~svn7913+lenny/debian/changelog	2008-12-18 00:37:23.000000000 +0100
@@ -1,3 +1,11 @@
+merkaartor (0.0.11~svn7913+lenny-1) testing-proposed-updates; urgency=low
+
+  * Fixing segfault due to the missing signal "loadDone" in QWebFrame from
+    Qt 4.4.1 with built-in webkit (Closes: #508907).
+  * Sourceful upload as the last uploads were native packages accidentally.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Thu, 18 Dec 2008 00:32:49 +0100
+
 merkaartor (0.0.11~svn7913-2) unstable; urgency=low
 
   * Explicitely call qmake-qt4. (Closes: #495807)
diff -Nru merkaartor-0.0.11~svn7913/debian/patches/load_done_signal merkaartor-0.0.11~svn7913+lenny/debian/patches/load_done_signal
--- merkaartor-0.0.11~svn7913/debian/patches/load_done_signal	1970-01-01 01:00:00.000000000 +0100
+++ merkaartor-0.0.11~svn7913+lenny/debian/patches/load_done_signal	2008-12-18 00:42:40.000000000 +0100
@@ -0,0 +1,12 @@
+--- a/QMapControl/browserimagemanager.cpp
++++ b/QMapControl/browserimagemanager.cpp
+@@ -47,7 +47,9 @@ BrowserImageManager::BrowserImageManager
+ 	browser->setPage(page);
+ 	page->setViewportSize(QSize(1024, 1024));
+ 
++#ifndef QT_WEBKIT_LIB
+ 	connect(page->mainFrame(), SIGNAL(loadDone(bool)), this, SLOT(pageLoadFinished(bool)));
++#endif
+ 	connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
+ 
+ //	browser->show();
diff -Nru merkaartor-0.0.11~svn7913/debian/patches/series merkaartor-0.0.11~svn7913+lenny/debian/patches/series
--- merkaartor-0.0.11~svn7913/debian/patches/series	2008-05-24 16:53:18.000000000 +0200
+++ merkaartor-0.0.11~svn7913+lenny/debian/patches/series	2008-12-18 00:42:07.000000000 +0100
@@ -1,2 +1,3 @@
 gcc-4.3-cast
 zlib-include
+load_done_signal

Reply to: