[SCM] qgis branch, master, updated. upstream/2.0.1-13448-gc357263

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit c357263f9f2d50bb51c616068e371b0abf222c84
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 29 16:17:54 2013 +0200

    Add patch to fix FTBFS on armel/armhf.

diff --git a/debian/changelog b/debian/changelog
index b9fda3d..106f5d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ qgis (2.0.1-1) unstable; urgency=low
   * Don't install extra license files.
   * Bump Standards-Version to 3.9.4, changes: minimal dh rules, Vcs-* field
     updates, shared library split and symbols.
+  * Add patch to fix FTBFS on armel/armhf. Thanks to Konstantinos Margaritis.
+    (closes: #691333)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 27 Sep 2013 02:05:32 +0200
 
diff --git a/debian/patches/qgis_arm.patch b/debian/patches/qgis_arm.patch
new file mode 100644
index 0000000..359c5f5
--- /dev/null
+++ b/debian/patches/qgis_arm.patch
@@ -0,0 +1,68 @@
+Description: On armel/armhf qreal is typedef'ed to float not double.
+Author: Konstantinos Margaritis <konstantinos.margaritis at freevec.org>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691333
+Last-Update: 2013-09-29
+--- a/src/core/qgscoordinatetransform.h
++++ b/src/core/qgscoordinatetransform.h
+@@ -154,6 +154,9 @@ class CORE_EXPORT QgsCoordinateTransform
+     // and y variables in place. The second one works with good old-fashioned
+     // C style arrays.
+     void transformInPlace( double& x, double& y, double &z, TransformDirection direction = ForwardTransform ) const;
++#ifdef QT_ARCH_ARM
++    void transformInPlace( qreal& x, qreal& y, double &z, TransformDirection direction = ForwardTransform ) const;
++#endif
+ 
+     //! @note not available in python bindings
+     void transformInPlace( QVector<double>& x, QVector<double>& y, QVector<double>& z,
+--- a/src/core/qgsmaptopixel.h
++++ b/src/core/qgsmaptopixel.h
+@@ -66,6 +66,9 @@ class CORE_EXPORT QgsMapToPixel
+        given coordinates in place. Intended as a fast way to do the
+        transform. */
+     void transformInPlace( double& x, double& y ) const;
++#ifdef QT_ARCH_ARM
++    void transformInPlace( qreal& x, qreal& y ) const;
++#endif
+ 
+     /* Transform device coordinates to map coordinates. Modifies the
+        given coordinates in place. Intended as a fast way to do the
+--- a/src/core/qgsmaptopixel.cpp
++++ b/src/core/qgsmaptopixel.cpp
+@@ -138,6 +138,14 @@ void QgsMapToPixel::transformInPlace( do
+   y = yMax - ( y - yMin ) / mMapUnitsPerPixel;
+ }
+ 
++#ifdef QT_ARCH_ARM
++void QgsMapToPixel::transformInPlace( qreal& x, qreal& y ) const
++{
++  double xd = (double) x, yd = (double) y;
++  transformInPlace(xd, yd);
++}
++#endif
++
+ void QgsMapToPixel::transformInPlace( QVector<double>& x,
+                                       QVector<double>& y ) const
+ {
+@@ -161,3 +169,4 @@ void QgsMapToPixel::transformInPlace( QV
+     transformInPlace( x[i], y[i] );
+ }
+ #endif
++
+--- a/src/core/qgscoordinatetransform.cpp
++++ b/src/core/qgscoordinatetransform.cpp
+@@ -416,6 +416,15 @@ void QgsCoordinateTransform::transformIn
+   }
+ }
+ 
++#ifdef QT_ARCH_ARM
++void QgsCoordinateTransform::transformInPlace( qreal& x, qreal& y, double& z,
++    TransformDirection direction ) const
++{
++  double xd = (double) x, yd = (double) y;
++  transformInPlace(xd, yd, z, direction);
++}
++#endif
++
+ void QgsCoordinateTransform::transformInPlace(
+   QVector<float>& x, QVector<float>& y, QVector<float>& z,
+   TransformDirection direction ) const
diff --git a/debian/patches/series b/debian/patches/series
index a965d76..c8f98d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+qgis_arm.patch
 an-other-typo.patch
 allows-to-typo.patch

-- 
The Quantum GIS in Debian project