[SCM] udav packaging branch, master, updated. debian/0.6.3-1-1-gb6ac398

[Salvatore Bonaccorso]

The following commit has been merged in the master branch:
commit b6ac398915ff52c6f10b6380dada4e77d0bd2496
Author: Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>
Date:   Sun Oct 24 21:13:22 2010 +0200

    * Change my email address.
    * Add fix-598069-segfault-under-kde.patch to fix a bug causing udav
      crashing at start under KDE (Closes: #598069).

diff --git a/debian/changelog b/debian/changelog
index 8c38686..6d5bf9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+udav (0.6.3-2) unstable; urgency=low
+
+  * Change my email address. 
+  * Add fix-598069-segfault-under-kde.patch to fix a bug causing udav
+    crashing at start under KDE (Closes: #598069).
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Sun, 24 Oct 2010 21:12:35 +0200
+
 udav (0.6.3-1) unstable; urgency=low
 
   * New upstream version (Closes: #562763) 
diff --git a/debian/control b/debian/control
index bb7c374..039260f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: udav
 Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>
+Uploaders: Salvatore Bonaccorso <carnil at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50), libmgl-dev (>= 1.10), libqt4-dev, libhdf5-serial-dev, imagemagick
 Standards-Version: 3.9.1
diff --git a/debian/patches/fix-598069-segfault-under-kde.patch b/debian/patches/fix-598069-segfault-under-kde.patch
new file mode 100644
index 0000000..c3995be
--- /dev/null
+++ b/debian/patches/fix-598069-segfault-under-kde.patch
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 0000000..10e061a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-598069-segfault-under-kde.patch

-- 
udav packaging