diff -Nru qgis-2.4.0/debian/changelog qgis-2.4.0/debian/changelog
--- qgis-2.4.0/debian/changelog	2014-07-08 05:04:52.000000000 +0000
+++ qgis-2.4.0/debian/changelog	2014-09-04 23:49:23.000000000 +0000
@@ -1,3 +1,9 @@
+qgis (2.4.0-1~exp1+plugwash1) UNRELEASED; urgency=medium
+
+  * Experimental arm fix, do not upload without further review
+
+ -- do <not@upload.without.review>  Thu, 04 Sep 2014 23:48:11 +0000
+
 qgis (2.4.0-1~exp1) experimental; urgency=medium
 
   [ Jürgen E. Fischer ]
diff -Nru qgis-2.4.0/debian/patches/arm-qreal.patch qgis-2.4.0/debian/patches/arm-qreal.patch
--- qgis-2.4.0/debian/patches/arm-qreal.patch	1970-01-01 00:00:00.000000000 +0000
+++ qgis-2.4.0/debian/patches/arm-qreal.patch	2014-09-04 23:48:02.000000000 +0000
@@ -0,0 +1,109 @@
+Description: Fix qreal VS double issues.
+ This patch fixes qreal VS double issues
+ 
+ There are two seperate issues, the first is trivial just a typecast on
+ a const.
+
+ The second is however less-trivial and should be discussed with
+ upstream before uploading. sip doesn't seem to like the type
+ QVector<double> on platforms where qreal is float but changing
+ the type to qreal has knock-on impacts on the native code.
+
+Author: Peter Michael Green <plugwash@debian.org>
+--- qgis-2.4.0.orig/python/core/composer/qgsatlascomposition.sip
++++ qgis-2.4.0/python/core/composer/qgsatlascomposition.sip
+@@ -155,7 +155,7 @@ public:
+      * @see setPredefinedScales
+      * @see QgsComposerMap::atlasScalingMode
+     */
+-    const QVector<double>& predefinedScales() const;
++    const QVector<qreal>& predefinedScales() const;
+ 
+     /**Sets the list of predefined scales for the atlas. This is used
+      * for maps which are set to the predefined atlas scaling mode.
+@@ -163,7 +163,7 @@ public:
+      * @see predefinedScales
+      * @see QgsComposerMap::atlasScalingMode
+      */
+-    void setPredefinedScales( const QVector<double>& scales );
++    void setPredefinedScales( const QVector<qreal>& scales );
+ 
+     /** Begins the rendering. Returns true if successful, false if no matching atlas
+       features found.*/
+--- qgis-2.4.0.orig/src/app/composer/qgscomposer.cpp
++++ qgis-2.4.0/src/app/composer/qgscomposer.cpp
+@@ -3594,7 +3594,7 @@ void QgsComposer::loadAtlasPredefinedSca
+     return;
+   }
+   QgsAtlasComposition& atlasMap = mComposition->atlasComposition();
+-  QVector<double> pScales;
++  QVector<qreal> pScales;
+   // first look at project's scales
+   QStringList scales( QgsProject::instance()->readListEntry( "Scales", "/ScalesList" ) );
+   bool hasProjectScales( QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" ) );
+--- qgis-2.4.0.orig/src/core/composer/qgsatlascomposition.cpp
++++ qgis-2.4.0/src/core/composer/qgsatlascomposition.cpp
+@@ -491,7 +491,7 @@ void QgsAtlasComposition::prepareMap( Qg
+       // choose one of the predefined scales
+       double newWidth = mOrigExtent.width();
+       double newHeight = mOrigExtent.height();
+-      const QVector<double>& scales = mPredefinedScales;
++      const QVector<qreal>& scales = mPredefinedScales;
+       for ( int i = 0; i < scales.size(); i++ )
+       {
+         double ratio = scales[i] / originalScale;
+@@ -747,13 +747,13 @@ bool QgsAtlasComposition::evalFeatureFil
+   return true;
+ }
+ 
+-void QgsAtlasComposition::setPredefinedScales( const QVector<double>& scales )
++void QgsAtlasComposition::setPredefinedScales( const QVector<qreal>& scales )
+ {
+   mPredefinedScales = scales;
+   // make sure the list is sorted
+   qSort( mPredefinedScales.begin(), mPredefinedScales.end() );
+ }
+ 
+ Q_NOWARN_DEPRECATED_PUSH
+ bool QgsAtlasComposition::fixedScale() const
+ {
+--- qgis-2.4.0.orig/src/core/composer/qgsatlascomposition.h
++++ qgis-2.4.0/src/core/composer/qgsatlascomposition.h
+@@ -183,7 +186,7 @@ class CORE_EXPORT QgsAtlasComposition :
+      * @see setPredefinedScales
+      * @see QgsComposerMap::atlasScalingMode
+     */
+-    const QVector<double>& predefinedScales() const { return mPredefinedScales; }
++    const QVector<qreal>& predefinedScales() const { return mPredefinedScales; }
+ 
+     /**Sets the list of predefined scales for the atlas. This is used
+      * for maps which are set to the predefined atlas scaling mode.
+@@ -191,7 +194,7 @@ class CORE_EXPORT QgsAtlasComposition :
+      * @see predefinedScales
+      * @see QgsComposerMap::atlasScalingMode
+      */
+-    void setPredefinedScales( const QVector<double>& scales );
++    void setPredefinedScales( const QVector<qreal>& scales );
+ 
+     /** Begins the rendering. Returns true if successful, false if no matching atlas
+       features found.*/
+@@ -320,7 +325,7 @@ class CORE_EXPORT QgsAtlasComposition :
+     void computeExtent( QgsComposerMap *map );
+ 
+     //list of predefined scales
+-    QVector<double> mPredefinedScales;
++    QVector<qreal> mPredefinedScales;
+ };
+ 
+ #endif
+--- qgis-2.4.0.orig/src/gui/qgscomposerview.cpp
++++ qgis-2.4.0/src/gui/qgscomposerview.cpp
+@@ -869,7 +869,7 @@ void QgsComposerView::mouseReleaseEvent(
+       else
+       {
+         QgsComposerAttributeTable* newTable = new QgsComposerAttributeTable( composition() );
+-        newTable->setSceneRect( QRectF( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), qMax( mRubberBandItem->rect().height(), 15.0 ) ) );
++        newTable->setSceneRect( QRectF( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), qMax( mRubberBandItem->rect().height(), (qreal)15.0 ) ) );
+         QList<const QgsComposerMap*> mapItemList = composition()->composerMapItems();
+         if ( mapItemList.size() > 0 )
+         {
diff -Nru qgis-2.4.0/debian/patches/series qgis-2.4.0/debian/patches/series
--- qgis-2.4.0/debian/patches/series	2014-07-08 05:04:52.000000000 +0000
+++ qgis-2.4.0/debian/patches/series	2014-09-04 23:42:42.000000000 +0000
@@ -2,3 +2,4 @@
 python-env.patch
 disable-doxygen.patch
 0001-oracle-provider-fix-closing-of-iterator-in-case-of-e.patch
+arm-qreal.patch