Bug#634282: phaseshift: diff for NMU version 0.40-13.3

[Didier Raboud <odyx@debian.org>]

tags 578970 + patch
tags 634282 + patch
thanks

Dear maintainer,

I've prepared an NMU for phaseshift (versioned as 0.40-13.3). The diff
is attached to this message.

Regards.

diff -u phaseshift-0.40/configure phaseshift-0.40/configure
--- phaseshift-0.40/configure
+++ phaseshift-0.40/configure
@@ -898,7 +898,7 @@
 #include "confdefs.h"
 
 int main() {
-${x_direct_test_function}()
+extern int ${x_direct_test_function}()
 ; return 0; }
 EOF
 if { (eval echo configure:905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff -u phaseshift-0.40/debian/control phaseshift-0.40/debian/control
--- phaseshift-0.40/debian/control
+++ phaseshift-0.40/debian/control
@@ -1,5 +1,5 @@
 Source: phaseshift
-Build-Depends: debhelper (>= 4), libqt3-mt-dev, libmng-dev, xlibmesa-gl-dev | libgl-dev, libjpeg62-dev, libpng12-dev, zlib1g-dev, libqt3-headers, autotools-dev
+Build-Depends: debhelper (>= 4), libqt3-mt-dev, libmng-dev, libgl1-mesa-dev | libgl-dev, libjpeg-dev, libpng12-dev, zlib1g-dev, libqt3-headers, autotools-dev
 Section: hamradio
 Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
diff -u phaseshift-0.40/debian/changelog phaseshift-0.40/debian/changelog
--- phaseshift-0.40/debian/changelog
+++ phaseshift-0.40/debian/changelog
@@ -1,3 +1,18 @@
+phaseshift (0.40-13.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [ Didier Raboud ]
+  * Build-Depend on libjpeg-dev instead of libjpeg62-dev. Closes: #634282
+  * Build-Depend on libgl1-mesa-dev instead of xlibmesa-gl-dev.
+    Closes: #578970
+  * Import patch from Ubuntu to fix the configure run.
+  
+  [ Ubuntu - Matthias Klose ]
+  * Fix C++ X libraries configure test, directly in configure. LP: #755937
+
+ -- Didier Raboud <odyx@debian.org>  Thu, 10 Nov 2011 01:39:44 +0100
+
 phaseshift (0.40-13.2) unstable; urgency=low
 
   * Retiring - remove myself from the uploaders list.