[SCM] udav packaging branch, master, updated. debian/0.6.3-2-5-g8d790a7

[Salvatore Bonaccorso]

The following commit has been merged in the master branch:
commit 8d790a7ed4c1bd89089bfe6f81070fb9c789cf4f
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Nov 10 09:23:03 2010 +0100

    Drop fix-598069-segfault-under-kde.patch as it is applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 4687879..473e154 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 udav (0.7-1) unstable; urgency=low
 
   * New upstream release.
+  * Drop fix-598069-segfault-under-kde.patch as it is applied upstream.
 
- -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 10 Nov 2010 09:14:17 +0100
+ -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 10 Nov 2010 09:22:50 +0100
 
 udav (0.6.3-2) unstable; urgency=low
 
diff --git a/debian/patches/fix-598069-segfault-under-kde.patch b/debian/patches/fix-598069-segfault-under-kde.patch
deleted file mode 100644
index c3995be..0000000
--- a/debian/patches/fix-598069-segfault-under-kde.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix segfault of udav when started under KDE.
-Author: Alexey Balakin <mathgl.abalakin at gmail.com>
-Origin: upstream, http://udav.svn.sourceforge.net/viewvc/udav/src/qmglcanvas.cpp?view=patch&r1=47&r2=46&pathrev=47
-Bug: http://sourceforge.net/support/tracker.php?aid=3085925
-Bug-Debian: http://bugs.debian.org/598069
-Forwarded: not-needed
-
---- udav-0.6.3.orig/src/qmglcanvas.cpp
-+++ udav-0.6.3/src/qmglcanvas.cpp
-@@ -75,7 +75,7 @@ void QMGLCanvas::paintEvent(QPaintEvent
- //-----------------------------------------------------------------------------
- void QMGLCanvas::resizeEvent(QResizeEvent *ev)
- {
--	if(autoResize)
-+	if(autoResize && ev->size().width()>0 && ev->size().height()>0)
- 	{	graph->SetSize(ev->size().width(), ev->size().height());	execute();	repaint();	}
- 	else	resize(graph->GetWidth(), graph->GetHeight());
- }
-@@ -86,7 +86,9 @@ void QMGLCanvas::setPer(int p)
- 	{	per = 100*p;	emit perChanged(p);	execute();	}
- }
- //-----------------------------------------------------------------------------
--void QMGLCanvas::imgSize(int w, int h)	{	graph->SetSize(w,h);	execute();	}
-+void QMGLCanvas::imgSize(int w, int h)
-+{	if(w<=0 || h<=0)	return;
-+	graph->SetSize(w,h);	execute();	}
- //-----------------------------------------------------------------------------
- void QMGLCanvas::setPhi(int p)
- {	if(phi!=p)	{	phi = p;	emit phiChanged(p);	execute();	}	}
-@@ -504,5 +506,6 @@ void QMGLCanvas::setMGLFont(QString path
- }
- //-----------------------------------------------------------------------------
- void QMGLCanvas::setSize(int w, int h)
--{	graph->SetSize(w,h);	resize(w, h);	execute();	}
-+{	if(w<=0 || h<=0)	return;
-+	graph->SetSize(w,h);	resize(w, h);	execute();	}
- //-----------------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 10e061a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-598069-segfault-under-kde.patch

-- 
udav packaging