rev 17325 - in trunk/packages/kdeedu/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-03-04 15:13:25 +0000 (Thu, 04 Mar 2010)
New Revision: 17325

Added:
   trunk/packages/kdeedu/debian/patches/00_improve_detection_of_gpsd_apis.diff
Modified:
   trunk/packages/kdeedu/debian/changelog
   trunk/packages/kdeedu/debian/patches/series
Log:
Add 00_improve_detection_of_gpsd_apis.diff patch to improve gpsd API detection.

Modified: trunk/packages/kdeedu/debian/changelog
===================================================================
--- trunk/packages/kdeedu/debian/changelog	2010-03-04 15:13:10 UTC (rev 17324)
+++ trunk/packages/kdeedu/debian/changelog	2010-03-04 15:13:25 UTC (rev 17325)
@@ -32,6 +32,7 @@
   * Do not ship Domestic_Manners.ttf and Dustismo_Roman.ttf fonts in khangman
     package since they are provided by the ttf-dustin package that khangman
     depends on.
+  * Add 00_improve_detection_of_gpsd_apis.diff patch to improve gpsd API detection.
 
   [ George Kiagiadakis ]
   * Add myself to uploaders.

Added: trunk/packages/kdeedu/debian/patches/00_improve_detection_of_gpsd_apis.diff
===================================================================
--- trunk/packages/kdeedu/debian/patches/00_improve_detection_of_gpsd_apis.diff	                        (rev 0)
+++ trunk/packages/kdeedu/debian/patches/00_improve_detection_of_gpsd_apis.diff	2010-03-04 15:13:25 UTC (rev 17325)
@@ -0,0 +1,25 @@
+Author: Modestas Vainius <modax at debian.org>
+Description: improve detection of gpsd API
+ Even if API major is bumped, it does not mean that this code won't build. So
+ simply use >=.
+
+--- a/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ b/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+@@ -20,7 +20,7 @@
+ {
+     gps_data_t* data = m_gpsd.open();
+     if ( data ) {
+-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 ) && defined( WATCH_ENABLE ) 
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( WATCH_ENABLE )
+         m_gpsd.stream( WATCH_ENABLE );
+ #endif
+         connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+@@ -32,7 +32,7 @@
+ void GpsdConnection::update()
+ {
+     gps_data_t* data = 0;
+-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 ) && defined( POLICY_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( POLICY_SET )
+     while ((data = m_gpsd.poll()) && !(data->set & POLICY_SET)) {
+         data = m_gpsd.poll();
+     }

Modified: trunk/packages/kdeedu/debian/patches/series
===================================================================
--- trunk/packages/kdeedu/debian/patches/series	2010-03-04 15:13:10 UTC (rev 17324)
+++ trunk/packages/kdeedu/debian/patches/series	2010-03-04 15:13:25 UTC (rev 17325)
@@ -1 +1,2 @@
+00_improve_detection_of_gpsd_apis.diff
 step_needs_-lcln.diff