Bug#667137: Debdiff for NMU fixing these 2 bugs

[Steve McIntyre]

-- 
Steve McIntyre, Cambridge, UK.                                steve at einval.com
"Every time you use Tcl, God kills a kitten." -- Malcolm Ray
-------------- next part --------------
diff -Nru clam-networkeditor-1.4.0/debian/changelog clam-networkeditor-1.4.0/debian/changelog
--- clam-networkeditor-1.4.0/debian/changelog	2011-05-16 14:04:37.000000000 +0000
+++ clam-networkeditor-1.4.0/debian/changelog	2012-05-13 14:46:06.000000000 +0000
@@ -1,3 +1,13 @@
+clam-networkeditor (1.4.0-3.1) unstable; urgency=low
+
+  * NMU
+  * Build with qt 4.8. Closes: #660252. Thanks to Andreas Moog for the
+    patch.
+  * Add -fpermissive to g++ command line to allow building with gcc 4.7
+    Closes: #667137
+
+ -- Steve McIntyre <93sam at debian.org>  Sun, 13 May 2012 15:46:02 +0100
+
 clam-networkeditor (1.4.0-3) unstable; urgency=low
 
   * debian/control: remove dev packages which are depended by libclam-dev.
diff -Nru clam-networkeditor-1.4.0/debian/patches/FTBFS_with_gcc_4.7 clam-networkeditor-1.4.0/debian/patches/FTBFS_with_gcc_4.7
--- clam-networkeditor-1.4.0/debian/patches/FTBFS_with_gcc_4.7	1970-01-01 00:00:00.000000000 +0000
+++ clam-networkeditor-1.4.0/debian/patches/FTBFS_with_gcc_4.7	2012-05-13 14:43:24.000000000 +0000
@@ -0,0 +1,12 @@
+Description: Fix FTFBS with gcc 4.7
+--- clam-networkeditor-1.4.0.orig/SConstruct	2012-05-13 14:40:35.114567421 +0000
++++ clam-networkeditor-1.4.0/SConstruct	2012-05-13 14:38:25.082566215 +0000
+@@ -129,7 +129,7 @@
+ 	# TODO: This should not be hardcoded neither prefix (because package install)
+ 	env.Append(CPPFLAGS='-DDATA_EXAMPLES_PATH="\\"${prefix}/share/networkeditor/example-data\\""')
+ 
+-env.Append( CCFLAGS=['-g','-O3','-Wall','-pipe'] )
++env.Append( CCFLAGS=['-g','-O3','-Wall','-pipe', '-fpermissive'] )
+ if env['release'] :
+ 	env.Append( CCFLAGS=['-fomit-frame-pointer'] )
+ 
diff -Nru clam-networkeditor-1.4.0/debian/patches/include_glu-h.patch clam-networkeditor-1.4.0/debian/patches/include_glu-h.patch
--- clam-networkeditor-1.4.0/debian/patches/include_glu-h.patch	1970-01-01 00:00:00.000000000 +0000
+++ clam-networkeditor-1.4.0/debian/patches/include_glu-h.patch	2012-05-13 14:33:54.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Add missing include to fix FTBFS with new qt4
+Author: Andreas Moog <amoog at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/791317
+
+--- clam-networkeditor-1.4.0.orig/src/widgets/QFirstPerson.hxx
++++ clam-networkeditor-1.4.0/src/widgets/QFirstPerson.hxx
+@@ -6,6 +6,8 @@
+ #include <QtGui/QKeyEvent>
+ #include <iostream>
+ #include <cmath>
++#include <GL/glu.h>
++
+ static float * vColor(const QColor & color)
+ {
+ 	static float vcolor[4];
diff -Nru clam-networkeditor-1.4.0/debian/patches/series clam-networkeditor-1.4.0/debian/patches/series
--- clam-networkeditor-1.4.0/debian/patches/series	2011-05-16 14:04:37.000000000 +0000
+++ clam-networkeditor-1.4.0/debian/patches/series	2012-05-13 14:43:34.000000000 +0000
@@ -1 +1,3 @@
 FTBFS_with_gcc_4.5
+include_glu-h.patch
+FTBFS_with_gcc_4.7