[DebianGIS-dev] r1192 - in packages/qgis/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-10-15 18:21:27 +0000 (Mon, 15 Oct 2007)
New Revision: 1192

Modified:
   packages/qgis/trunk/debian/changelog
   packages/qgis/trunk/debian/patches/composer.dpatch
Log:
Better patch to reflect Qt4 prototypes.


Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog	2007-10-15 18:03:21 UTC (rev 1191)
+++ packages/qgis/trunk/debian/changelog	2007-10-15 18:21:27 UTC (rev 1192)
@@ -1,7 +1,6 @@
-qgis (0.8.1-2) UNRELEASED; urgency=low
+qgis (0.8.1-2) unstable; urgency=medium
 
   [ Francesco Paolo Lovergine ]
-  * NOT RELEASED YET
   * Fixed wrong build-deps:
   	python-qt4-dev -> python-qt4
         python-sip4-dev -> python-sip4

Modified: packages/qgis/trunk/debian/patches/composer.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/composer.dpatch	2007-10-15 18:03:21 UTC (rev 1191)
+++ packages/qgis/trunk/debian/patches/composer.dpatch	2007-10-15 18:21:27 UTC (rev 1192)
@@ -7,13 +7,13 @@
 @DPATCH@
 diff -urNad qgis~/src/composer/qgscomposition.cpp qgis/src/composer/qgscomposition.cpp
 --- qgis~/src/composer/qgscomposition.cpp	2007-06-28 13:12:02.000000000 +0200
-+++ qgis/src/composer/qgscomposition.cpp	2007-10-15 18:02:55.000000000 +0200
++++ qgis/src/composer/qgscomposition.cpp	2007-10-15 20:20:07.000000000 +0200
 @@ -236,7 +236,7 @@
    mLastPoint = p;
  
    double x,y;
 -  mView->inverseWorldMatrix().map( e->pos().x(), e->pos().y(), &x, &y );
-+  mView->inverseWorldMatrix().map( (double) e->pos().x(), (double) e->pos().y(), &x, &y );
++  mView->inverseWorldMatrix().map( (qreal) e->pos().x(), (qreal) e->pos().y(), (qreal *)&x, (qreal *)&y );
  
    switch ( mTool ) {
      case Select:
@@ -22,7 +22,7 @@
        if ( mSelectedItem ) {
          double x,y;
 -        mView->inverseWorldMatrix().map( e->pos().x(), e->pos().y(), &x, &y );
-+        mView->inverseWorldMatrix().map( (double) e->pos().x(), (double) e->pos().y(), &x, &y );
++        mView->inverseWorldMatrix().map( (qreal) e->pos().x(), (qreal) e->pos().y(), (qreal *)&x, (qreal *)&y );
  
          mSelectedItem->moveBy ( x - mLastX, y - mLastY );