Merge lp:~kamalmostafa/ubuntu/lucid/qtoctave/fix-507163-ftbfs into lp:ubuntu/lucid/qtoctave

[Kamal Mostafa]

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-11 16:29:55 +0000
+++ debian/changelog	2010-01-16 16:16:14 +0000
@@ -1,3 +1,10 @@
+qtoctave (0.8.2+dfsg-2ubuntu1) lucid; urgency=low
+
+  * debian/patches/allow_qt_ge_44: allow build with Qt version >= 4.5
+    (not just == 4.5).
+
+ -- Kamal Mostafa <[e-mail]>  Sat, 16 Jan 2010 08:08:49 -0800
+
 qtoctave (0.8.2+dfsg-2) unstable; urgency=low
 
   * Fix build failure for GCC 4.4 via use_cstdio_header (closes: #550264)

=== added file 'debian/patches/allow_qt_ge_44'
--- debian/patches/allow_qt_ge_44	1970-01-01 00:00:00 +0000
+++ debian/patches/allow_qt_ge_44	2010-01-16 16:16:14 +0000
@@ -0,0 +1,22 @@
+  * CMakeLists.txt: allow build with Qt version >= 4.5 (not just == 4.5).
+=== modified file 'CMakeLists.txt'
+--- a/CMakeLists.txt	2009-10-04 10:08:00 +0000
++++ b/CMakeLists.txt	2010-01-13 20:21:17 +0000
+@@ -28,13 +28,13 @@
+ 
+ include(UseQt4)
+ 
+-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5   )
++if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} GREATER 4   )
+ 	MESSAGE (FATAL_ERROR 
+-			"Qt version 4.5 required.\n"
++			"Qt version 4.5 or greater is required.\n"
+ 			"Qt version installed is: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
+ 			"Please install required version.\n"
+ 		)
+-endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5   )
++endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} GREATER 4   )
+ 
+ 
+ 
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-10-11 16:29:55 +0000
+++ debian/patches/series	2010-01-16 16:16:14 +0000
@@ -6,3 +6,4 @@
 install_easyplot_as_target
 build-out-of-source
 use_cstdio_header
+allow_qt_ge_44