tags 508907 + patch
thanks

Dear maintainer,

I've prepared an NMU for merkaartor (versioned as 0.0.11~svn7913-2.1).
I'm not going to upload it, please tell me if I need to do so.

Regards,
David Paleino
diff -Nru merkaartor-0.0.11~svn7913/debian/changelog 
merkaartor-0.0.11~svn7913/debian/changelog
--- merkaartor-0.0.11~svn7913/debian/changelog  2008-08-23 13:46:49.000000000 
+0200
+++ merkaartor-0.0.11~svn7913/debian/changelog  2008-12-21 00:07:28.000000000 
+0100
@@ -1,3 +1,11 @@
+merkaartor (0.0.11~svn7913-2.1) testing-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * Added debian/patches/fix-QWebFrame-loadDone-signal patch
+    (Closes: #508907)
+
+ -- David Paleino <d.pale...@gmail.com>  Sun, 21 Dec 2008 00:06:46 +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/fix-QWebFrame-loadDone-signal 
merkaartor-0.0.11~svn7913/debian/patches/fix-QWebFrame-loadDone-signal
--- merkaartor-0.0.11~svn7913/debian/patches/fix-QWebFrame-loadDone-signal      
1970-01-01 01:00:00.000000000 +0100
+++ merkaartor-0.0.11~svn7913/debian/patches/fix-QWebFrame-loadDone-signal      
2008-12-21 00:06:27.000000000 +0100
@@ -0,0 +1,14 @@
+Author: Holger Schurig
+URL: http://www.mail-archive.com/merkaar...@openstreetmap.org/msg00295.html
+--- merkaartor-0.0.11~svn7913.orig/QMapControl/browserimagemanager.cpp
++++ merkaartor-0.0.11~svn7913/QMapControl/browserimagemanager.cpp
+@@ -47,7 +47,9 @@
+       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/debian/patches/series
--- merkaartor-0.0.11~svn7913/debian/patches/series     2008-05-24 
16:53:18.000000000 +0200
+++ merkaartor-0.0.11~svn7913/debian/patches/series     2008-12-21 
00:05:21.000000000 +0100
@@ -1,2 +1,3 @@
 gcc-4.3-cast
 zlib-include
+fix-QWebFrame-loadDone-signal



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to